Working towards Issue #13: (stuff that was missing from last commit).

Accidentally left this out of the last commit. Oops.