massive reconfiguration time again.

No dancing around with the two step. that's YR's song and dance