Unfortunately due to priority issues this is not going to happen in a near future, since I am mostly looking into this as a preparation for an issue I know my team will face, but when I do get to make it I can try to tidy it up.