Fix up the storage layer
Fix up the storage layer

ndmitchell/shake,nh2/shake,nh2/shake,ndmitchell/shake,ndmitchell/shake,nh2/shake,nh2/shake,ndmitchell/shake,ndmitchell/shake,ndmitchell/shake,nh2/shake