Make charmstore (nearly) compile
wip