Sixth Commit

Bug with the query module but overall polished