Fixed all the queries and added them to the queries folder
ignoring matt's commit
Need to learn how to do merge conflicts.....