progress on DB and Config work refactoring