Moved game state stuff into the GameState object