ABXY query

Currently in progress. Made it into a PR to pull from the AWS machine and try it out.