Add lots of Storage related diagnostics
Add lots of Storage related diagnostics

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