Collision detection seems to be working, need to generalize it