Jason Madigan Although I have the bulk of the work done here, I don't this is going to be fully merged for some time yet. I suggest that I close out the ticket. As changes come in, they will hopefully be small, and can be done async. If not I will raise a new issue to progress the work further.