Style and story WIP
Whoops, in master. Fixing some story issues.
More routes
Merge branch 'master' into development