started object oriented conversion of GameState in client code