Refactoring (state system, etc.) and started implementing Game Over