Framework in place for queries
Wired up actual queries