Changed placement and buckets
Merge branch 'CaseyEditBranch' of github.com:voodoo-rific/voodoo into introduce_db