Start of refactoring the mess of Game