sq
refactoring continues