OK, I'm awaiting your PR then (I almost jumped on doing this but luckily scanned through and got the signal)