Revert "Revert 9b98922..f3c2d4e"

This reverts commit 2f1b28c43c754a0e69a8c134bf0219d22c2a3323.
Edited to clarify concepts
Merge pull request #1 from pklipp/hogan

Hogan edits