Refactoring to extend game and include screens