Adding Query 2, and set up the rest