Started refactoring for gameplay.