Ok, not a bad idea. But yeah, in another PR. :smile: