@spicyj I'm happy to merge this and take an update that goes with your open PR (which I'll merge today if I have time)