CHANGED: Create a base controller in place of the legacy admin
Merge branch 'base-admin-class'