debugging refactor/comprehensive db population