new db stuff
Merge branch 'DBUPDATE'