[breaking] Incremental work on storage API, more to come.