Removed clauses added set interface, moved clause logic up to top level query objects.