pushing up incompleate code so we can merge our classes

This new code includes the incompleate GameManager class and a few new methods in the game class.