Controllers that still testing
Merge branch 'feature/42-controllers'