Cleaned up migrations
Added remaining template
Merge branch 'dev'