Work on GameState logic
Finish Gamestate logic and menu (minor refactor)