Initial set of changes for discussion.
Changes based on feedback.
Merge pull request #1 from raritan/initial_discussion

Initial set of changes for discussion.