more routes and things
Merge branch 'routes'

* routes:
  more routes and things