Platforms

Properly merged the collision detection and reaction code in.