Working on adding in some simplification/floating steps.