Added queries for mock testing. Marginally untested (I created some rudimentary tests for the basics and stubbed out a more complete set for later)