Storage graphs

This needs a TODO: to rearrange this for localization. It doesn't really work for that case.