J query branch

PLease review and pull