* Next step in base controller refactoring