Finished the StorageAPI work left but it works.