wip/soqt
