SQL refactor WIP