Gamestate refactor part2