done with first section on query builder