Keenan - Cleaned up base controller