WIP: update for base controller refactor.