Refactoring + Game class development in progress