Lots of work on the Condition editor.