Starting to implement StorageDetect.