:+1: to this suggestion, but I also agree that this is out of scope for this pr.