Thanks for working on this!
I'll try to find some time this week to submit a couple of PRs based on this work.  Have a good night