Moved more stuff into gamestate