as it stands, this looks like the only tricky bit to this change so far, but just FYI: i will likely be changing the internals of

Step

quite a bit.