Continue refactoring. Only Game left!