lots of changes to db, branch in workable state