Started work on storage solution