Ok, I guess because I'm already touching the code I may aswell.
Expect it soon ish.