Started working on query builder