Add Condition operators and tests
Redo relationships