Collision detection now working