Did some work on the game class