I have a local branch where I’ve been working on this, among other things. I can’t give an exact timeline, but it wasn’t too difficult to replace os with os2 and have all tests passing.
EDIT: As I mentioned over here, there’s one major blocker to this, which is where almost all of my time has gone. It’s hard to put a number on it, but I’ve been making good - if slow - progress.