Add Query
Grunt first pass