Commit before yet another collision refector.
Collisions refactored AGAIN, nearly time to move on to NPCs and scoring
Game world mostly working, start adding NPCs and scoring