moving various things into GameState from other classes