Rewrite - Adding Collision

Iv have gotten the engine rewrite to a stable state and am now integrating sparky's collision, cross your fingers :/