Finally finished collision detection

Now on to AI!