Adding db stuff
Merging master