not crazy about the name; but it's a bit late now.  merging into mainline on internal now.