WIP: expose shifted state in Query interface
Tweaking stepwise interface