Working on nocontrol refactor.