@pippinsplugins curious if you wanted to do this in core