Updated Queries

Our combined work from 1-15.

Only 16, 17, and the trigger left.