Move controller code to a separate file
Router context passing
First use of context passing