Certainly, but I think that should be a separate PR.