untested start of db rework