Reorganized gamestate a little.