Refactored so that the game_state can be accessed as an attribute across appropriate classes