Query engine mid-design - not stable