Lots of reworking, back to implementing homebrewed Physics engine.