adt now has a vector of conditions! added several helper classes