Changed around the structure of the game class.