move some things around
Merge branch 'dev'