Started refactoring the game state