Need to work on the query builder more