Getting ready for DB stuff
Merge branch 'Start-adding-DB-parameters'