Added db functionality
Merge conflicts.