And I'd definitely like to get https://github.com/pantsbuild/pants/pull/9888 in (@witty-crayon-22786, if you could give it a final look? thanks)

looks good