Database re-factory, updated to star working with databases
Merge remote-tracking branch 'origin/master'