Added Step base class; New discriminants; seperation of cuts and plots started