Add game controller and refactored lots