Refactor to use routes.
Merge branch 'routes'