Slight refactoring

Also setting up the Physics engine to do things.