WIP -- just use the predicates for all where-clauses