Collision detection Perfection.

Collision detection is now where it needs to be.