Yeah, I'll open another PR for that.