Updated optimizers to include PropertyStep. Reworked current logic. Tests to be added.