Ok, will add it to my new PR (this one is getting kind of messy)