Database refactoring nightmare #2 pre-debug