Added the storage functionality to extrasafe app
Fixed the merge issues