No more storage adventures

Back to work