almost finished query builder - tests still failing