refactored to separate data storage with more conversion helpers
Merge branch 'master' of https://github.com/iConstituent/charmed