Routing controls implemented.
Merge branch 'routing'