Massive push up of controllers, templates, oh my