Commit 6.  See Issue #2
Commit 7.  Closes Issue #3
Commit 8.  Closes issue #3.
Commit 9.  Really closes #3.