Pretty much done with the collision detection