I'd like to push this to stable-2.0.  Comments and suggestions welcome.

     Mark