Worked through the unit tests.  Three remain which fail.