Adding some queries. Some more work needs to be done there