Removed GameState, added NPC
Merge