Issue #5 complete.