add db abilities..
Clean up after merge conflicts. Fix connection to database