I’ll come back to this in a future PR.  I just wanna get this merged for now. :)