Add charge model
fixup charge model
Merge branch 'master' of https://github.com/dzbarsky/Roomy