New game design, code refactor.