Updated doc, preparing to add new functionality
Creating the query in the fashionest of ways