Moving to have a game state class