CollisionDetectionWorking

Next, clean up basic game.