v2

@troygoode CR please.  Thanks!
Yes.  Thanks.