Dev branch

db functions stable