Then we have a bigger problem. This still isn't the right place - it's artificial coupling. Let's try to figure this out :smile: I'm OK treating this as a separate PR, but it has to be the very next PR - I don't want to wait 3 months after which we've started depending on this plumbing and made other decisions that depend on this.