Changed rest of Game so that it only used GameState