agree nasty, but agree worth minimizing db refactors right now