Game is functional but needs refactoring