Beginning to add to grid based on query

Early stages of this