Final commit for today. Todo: controller tests