Moving Storage out of Marvin and into it's own Gem.