workign on query builder
where clauses seem to be working, not fully tested