db all set up and ready to collect
merge conflict resolved
Merge branch 'stbarrientos-db-setup'