Main Game Still Broken

NPC Classes should be good to test.
Rewrite the main game code to use the new classes.