Refactor: activeMove attribute has been put back under the controller, not the model