work in progress on db handler
solving merge conflicts