Issue #49 Almost done.