everything but controllers
avoiding merge conflict
Merge branch 'controller-setup'
getting seeds file