Lots of cleanup.  Need to document all parameters and include example
usage.