Add route to controller
Merge branch 'sharils' into wip