GridQuery class redesign (WIP)