Add Query
Grunt first pass
WIP