All existing functional tests pass, but a couple more needed.  All unit tests green.
Closes #245, #253