Need to do the dirty job in layer
Start working on the storage