Yep, I kinda wanted to settle on the terminology and implementation before commenting it -- but I'll plan to circle round on this once we've settled on that.