added DB stuff
and more DB stuff