[ci skip] It compiles!

And some tests pass...

But still can't get rid of that big hairy deprecation