Refactor and temporarily broke the game