storage rewrite
Merge pull request #30 from seavor/jay

storage rewrite