@355E3B Please poke me when you push your branch to GH. Even before you open a PR I'd like to read it so I don't fall behind, it feels like there's a lot of moving parts here.