Happy for this to have a separate PR.