Need to refactor and clean up code before 1.0.

Comments

bmcclure created an issue.