Collision detection kind of up and going
Merge fix