Query HW 2 - Final revised

+ I take my last commit back, I misread the last problem and
overcomplicated things
+ Redid the last problem