Add basic router boilerplate
Merge branch 'router' into develop