v5

Collision detection, needs some work