working on storage code