unfinished business in which we replace the storage layer