Reverting

This reverts Ellen's changes.  If this looks reasonable (it does to me)  I'll do this directly in the finished branch rather than adding additional complexity by merging this into finished.

When Ellen gets back and we want to get her changes, I believe we will want to revert these reversions rather than trying to re commit her original changes.