Finished base controller
Merge branch 'development' of https://github.com/michaelianjones/oakcanyon into development