Fixing everything back up.  Getting close to meeting current unit tests.
Getting close to meeting current unit test.