ObjectManager now controls collisions and velocity

Reverted to xyz system