Good morning, I opened this PR a while back and it seemed like it was close to being merged, but over the last few months things have gone quiet. I have come back and resolved the merge conflicts a few times now but there were already a few alternatives discussed in the PR comments, so I'm wondering if it's still a relevant contribution. Happy to resolve the current conflicts if so, please let me know.