All tests pass.  Plan to refactor a bit.