113 Start of removing some duplicate code in Condition Builder