Thomas's Revisions

This builds upon pull request #1.