Alright. If you want it, I have code and a PR on standby, I was just waiting for something before opening it
