some work on storage