Refactoring game to allow for save/resume