further work on settings views
merge conflict
oops
Merge branch 'master' into evan
gtfo routes