Adding Isidro's code and PhysicsManager
Test after pull.  Yup.