Move more globals into the game state block.