diff --git a/.travis.yml b/.travis.yml
index acb7547d721..37823e44321 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,15 @@ xcode_scheme: FirebaseUI
 
 rvm: 2.3.1
 before_install:
+  - gem uninstall cocoapods -a
   - gem install cocoapods -v '1.0.1'
   - pod install --repo-update
 
 script: xcodebuild -workspace FirebaseUI.xcworkspace
   -scheme FirebaseUI
   -sdk iphonesimulator
-  -destination 'platform=iOS Simulator,name=iPhone 6s'
+  -destination 'platform=iOS Simulator,name=iPhone 7'
+  build
   test
   ONLY_ACTIVE_ARCH=YES
   CODE_SIGNING_REQUIRED=NO
diff --git a/FirebaseStorageUI/UIImageView+FirebaseStorage.h b/FirebaseStorageUI/UIImageView+FirebaseStorage.h
index 8439728de9d..0a1fe07167c 100644
--- a/FirebaseStorageUI/UIImageView+FirebaseStorage.h
+++ b/FirebaseStorageUI/UIImageView+FirebaseStorage.h
@@ -16,8 +16,9 @@
 
 @import UIKit;
 
-@import FirebaseStorage;
-@import SDWebImage;
+#import <FirebaseStorage/FirebaseStorage.h>
+#import <SDWebImage/UIImageView+WebCache.h>
+#import <SDWebImage/UIImage+MultiFormat.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/FirebaseUI.xcodeproj/project.pbxproj b/FirebaseUI.xcodeproj/project.pbxproj
index eda92118aa5..4270cb6d9f9 100644
--- a/FirebaseUI.xcodeproj/project.pbxproj
+++ b/FirebaseUI.xcodeproj/project.pbxproj
@@ -6442,6 +6442,7 @@ fi
 					<string>"${PODS_ROOT}/GoogleSignIn/Frameworks"</string>
 					<string>"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks"</string>
 					<string>"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks"</string>
+					<string>"${PODS_ROOT}/FirebaseCore/Frameworks/frameworks"</string>
 				</array>
 				<key>INFOPLIST_FILE</key>
 				<string>FirebaseGoogleAuthUI/Info.plist</string>
@@ -6486,6 +6487,7 @@ fi
 					<string>"${PODS_ROOT}/GoogleSignIn/Frameworks"</string>
 					<string>"${PODS_ROOT}/FirebaseAuth/Frameworks/frameworks"</string>
 					<string>"${PODS_ROOT}/FirebaseAnalytics/Frameworks/frameworks"</string>
+					<string>"${PODS_ROOT}/FirebaseCore/Frameworks/frameworks"</string>
 				</array>
 				<key>INFOPLIST_FILE</key>
 				<string>FirebaseGoogleAuthUI/Info.plist</string>
diff --git a/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseStorageUI.xcscheme b/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseStorageUI.xcscheme
new file mode 100644
index 00000000000..ddca757671d
--- /dev/null
+++ b/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseStorageUI.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0800"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
+               BuildableName = "FirebaseStorageUI.framework"
+               BlueprintName = "FirebaseStorageUI"
+               ReferencedContainer = "container:FirebaseUI.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "8D9084351D9316AB00333CC8"
+               BuildableName = "FirebaseStorageUITests.xctest"
+               BlueprintName = "FirebaseStorageUITests"
+               ReferencedContainer = "container:FirebaseUI.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
+            BuildableName = "FirebaseStorageUI.framework"
+            BlueprintName = "FirebaseStorageUI"
+            ReferencedContainer = "container:FirebaseUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
+            BuildableName = "FirebaseStorageUI.framework"
+            BlueprintName = "FirebaseStorageUI"
+            ReferencedContainer = "container:FirebaseUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "8D90842D1D9316AB00333CC8"
+            BuildableName = "FirebaseStorageUI.framework"
+            BlueprintName = "FirebaseStorageUI"
+            ReferencedContainer = "container:FirebaseUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseTwitterAuthUI.xcscheme b/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseTwitterAuthUI.xcscheme
new file mode 100644
index 00000000000..e1b80b53c65
--- /dev/null
+++ b/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseTwitterAuthUI.xcscheme
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
+               BuildableName = "FirebaseTwitterAuthUI.framework"
+               BlueprintName = "FirebaseTwitterAuthUI"
+               ReferencedContainer = "container:FirebaseUI.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C325169A1D88A54C00B0B3F9"
+               BuildableName = "FirebaseTwitterAuthUITests.xctest"
+               BlueprintName = "FirebaseTwitterAuthUITests"
+               ReferencedContainer = "container:FirebaseUI.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
+            BuildableName = "FirebaseTwitterAuthUI.framework"
+            BlueprintName = "FirebaseTwitterAuthUI"
+            ReferencedContainer = "container:FirebaseUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
+            BuildableName = "FirebaseTwitterAuthUI.framework"
+            BlueprintName = "FirebaseTwitterAuthUI"
+            ReferencedContainer = "container:FirebaseUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C32516911D88A54C00B0B3F9"
+            BuildableName = "FirebaseTwitterAuthUI.framework"
+            BlueprintName = "FirebaseTwitterAuthUI"
+            ReferencedContainer = "container:FirebaseUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseUI.xcscheme b/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseUI.xcscheme
index d51571bda04..50f093f1c2a 100644
--- a/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseUI.xcscheme
+++ b/FirebaseUI.xcodeproj/xcshareddata/xcschemes/FirebaseUI.xcscheme
@@ -26,8 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
diff --git a/FirebaseUI_dev_storage.podspec b/FirebaseUI_dev_storage.podspec
new file mode 100644
index 00000000000..2f728178f75
--- /dev/null
+++ b/FirebaseUI_dev_storage.podspec
@@ -0,0 +1,20 @@
+Pod::Spec.new do |s|
+  s.name         = 'FirebaseStorageUI'
+  s.version      = '0.5.6-rc3'
+  s.summary      = 'UI Storage library for Firebase.'
+  s.homepage     = 'https://github.com/firebase/FirebaseUI-iOS'
+  s.license      = { :type => 'Apache 2.0' }
+  s.author       = 'Firebase'
+  s.source = { :git => "../../FirebaseUI-iOS.git" }
+  s.platform = :ios
+  s.ios.deployment_target = '8.0'
+  s.ios.framework = 'UIKit'
+  s.requires_arc = true
+  s.default_subspecs = 'Storage'
+
+  s.subspec 'Storage' do |storage|
+    storage.source_files = "FirebaseStorageUI/*.{h,m}"
+    storage.dependency 'Firebase/Storage', '~> 3.0'
+    storage.dependency 'SDWebImage'
+  end
+end
diff --git a/Podfile b/Podfile
index 8f530d7dea2..8edec5cc74f 100644
--- a/Podfile
+++ b/Podfile
@@ -25,7 +25,6 @@ end
 target 'FirebaseAuthUI' do
   # Pods for Auth
   pod 'Firebase/Auth'
-  pod 'Firebase/Core'
 
   target 'FirebaseAuthUITests' do
     inherit! :search_paths
@@ -45,7 +44,6 @@ end
 target 'FirebaseGoogleAuthUI' do
   # Pods for Google Auth
   pod 'GoogleSignIn', '~> 4.0'
-  pod 'Firebase/Core'
 
   target 'FirebaseGoogleAuthUITests' do
     inherit! :search_paths
diff --git a/samples/objc/FirebaseUIChat.xcodeproj/project.pbxproj b/samples/objc/FirebaseUIChat.xcodeproj/project.pbxproj
index d0d00ec75ae..3cd1578e70e 100644
--- a/samples/objc/FirebaseUIChat.xcodeproj/project.pbxproj
+++ b/samples/objc/FirebaseUIChat.xcodeproj/project.pbxproj
@@ -7,7 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		34755DFFAC2DCB6B1176CE87 /* libPods-FirebaseUIChat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2CFFAE2215B9D3116BF1AEEF /* libPods-FirebaseUIChat.a */; };
+		8D7D5DC11D9D9536006C1857 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */; };
+		8D7F86B51D9DAA0100C2A122 /* FIRStorageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7F86B41D9DAA0100C2A122 /* FIRStorageViewController.m */; };
 		C375CB181D935D1F002EECD3 /* FIRCustomAuthPickerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C375CB161D935D1F002EECD3 /* FIRCustomAuthPickerViewController.m */; };
 		C375CB191D935D1F002EECD3 /* FIRCustomAuthPickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = C375CB171D935D1F002EECD3 /* FIRCustomAuthPickerViewController.xib */; };
 		C375CB1C1D943D5F002EECD3 /* FIRCustomAuthUIDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C375CB1B1D943D5F002EECD3 /* FIRCustomAuthUIDelegate.m */; };
@@ -18,7 +19,6 @@
 		C3AC67621D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = C3AC675B1D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib */; };
 		C3AC67631D81FE6B00FC956D /* FIRChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */; };
 		C3AC67661D82002F00FC956D /* FIRSample.m in Sources */ = {isa = PBXBuildFile; fileRef = C3AC67651D82002F00FC956D /* FIRSample.m */; };
-		C3F23ECB1D80F26E0020509F /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C3F23ECA1D80F26E0020509F /* GoogleService-Info.plist */; };
 		C3F23ED01D80F58A0020509F /* FIRSamplesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C3F23ECF1D80F58A0020509F /* FIRSamplesViewController.m */; };
 		D81A05F61B86A78700498183 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F51B86A78700498183 /* main.m */; };
 		D81A05F91B86A78700498183 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D81A05F81B86A78700498183 /* AppDelegate.m */; };
@@ -28,9 +28,9 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		104B66B372B77CFFE53BC90D /* Pods-FirebaseUIChat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUIChat.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUIChat/Pods-FirebaseUIChat.debug.xcconfig"; sourceTree = "<group>"; };
-		2CFFAE2215B9D3116BF1AEEF /* libPods-FirebaseUIChat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FirebaseUIChat.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		92E1431893A040764FCC115E /* Pods-FirebaseUIChat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUIChat.release.xcconfig"; path = "Pods/Target Support Files/Pods-FirebaseUIChat/Pods-FirebaseUIChat.release.xcconfig"; sourceTree = "<group>"; };
+		8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
+		8D7F86B31D9DAA0100C2A122 /* FIRStorageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIRStorageViewController.h; path = Storage/FIRStorageViewController.h; sourceTree = "<group>"; };
+		8D7F86B41D9DAA0100C2A122 /* FIRStorageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FIRStorageViewController.m; path = Storage/FIRStorageViewController.m; sourceTree = "<group>"; };
 		C375CB151D935D1F002EECD3 /* FIRCustomAuthPickerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRCustomAuthPickerViewController.h; sourceTree = "<group>"; };
 		C375CB161D935D1F002EECD3 /* FIRCustomAuthPickerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRCustomAuthPickerViewController.m; sourceTree = "<group>"; };
 		C375CB171D935D1F002EECD3 /* FIRCustomAuthPickerViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FIRCustomAuthPickerViewController.xib; sourceTree = "<group>"; };
@@ -49,7 +49,6 @@
 		C3AC675D1D81FE6B00FC956D /* FIRChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRChatViewController.m; sourceTree = "<group>"; };
 		C3AC67641D82002F00FC956D /* FIRSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRSample.h; sourceTree = "<group>"; };
 		C3AC67651D82002F00FC956D /* FIRSample.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRSample.m; sourceTree = "<group>"; };
-		C3F23ECA1D80F26E0020509F /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "FirebaseUIChat/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		C3F23ECE1D80F5890020509F /* FIRSamplesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRSamplesViewController.h; sourceTree = "<group>"; };
 		C3F23ECF1D80F58A0020509F /* FIRSamplesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FIRSamplesViewController.m; sourceTree = "<group>"; };
 		D81A05F01B86A78700498183 /* FirebaseUIChat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FirebaseUIChat.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -67,28 +66,19 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				34755DFFAC2DCB6B1176CE87 /* libPods-FirebaseUIChat.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		04481B557470072D773A3262 /* Frameworks */ = {
+		8D7D5DC51D9DA075006C1857 /* Storage */ = {
 			isa = PBXGroup;
 			children = (
-				2CFFAE2215B9D3116BF1AEEF /* libPods-FirebaseUIChat.a */,
+				8D7F86B31D9DAA0100C2A122 /* FIRStorageViewController.h */,
+				8D7F86B41D9DAA0100C2A122 /* FIRStorageViewController.m */,
 			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		5FA27A05804A9B1A0ADDA56C /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				104B66B372B77CFFE53BC90D /* Pods-FirebaseUIChat.debug.xcconfig */,
-				92E1431893A040764FCC115E /* Pods-FirebaseUIChat.release.xcconfig */,
-			);
-			name = Pods;
+			name = Storage;
 			sourceTree = "<group>";
 		};
 		C3AC67501D81FE6B00FC956D /* Samples */ = {
@@ -96,6 +86,7 @@
 			children = (
 				C3AC67511D81FE6B00FC956D /* Auth */,
 				C3AC67541D81FE6B00FC956D /* Chat */,
+				8D7D5DC51D9DA075006C1857 /* Storage */,
 			);
 			path = Samples;
 			sourceTree = "<group>";
@@ -133,11 +124,9 @@
 		D81A05E71B86A78700498183 = {
 			isa = PBXGroup;
 			children = (
-				C3F23ECA1D80F26E0020509F /* GoogleService-Info.plist */,
+				8D7D5DC01D9D9536006C1857 /* GoogleService-Info.plist */,
 				D81A05F21B86A78700498183 /* FirebaseUIChat */,
 				D81A05F11B86A78700498183 /* Products */,
-				5FA27A05804A9B1A0ADDA56C /* Pods */,
-				04481B557470072D773A3262 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -237,11 +226,11 @@
 			buildActionMask = 2147483647;
 			files = (
 				D81A05FF1B86A78700498183 /* Main.storyboard in Resources */,
-				C3F23ECB1D80F26E0020509F /* GoogleService-Info.plist in Resources */,
 				C3AC67621D81FE6B00FC956D /* FIRChatMessageTableViewCell.xib in Resources */,
 				D81A06041B86A78700498183 /* LaunchScreen.xib in Resources */,
 				D81A06011B86A78700498183 /* Images.xcassets in Resources */,
 				C375CB191D935D1F002EECD3 /* FIRCustomAuthPickerViewController.xib in Resources */,
+				8D7D5DC11D9D9536006C1857 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -310,6 +299,7 @@
 				C3AC675F1D81FE6B00FC956D /* FIRChatMessage.m in Sources */,
 				D81A05F61B86A78700498183 /* main.m in Sources */,
 				C3AC67661D82002F00FC956D /* FIRSample.m in Sources */,
+				8D7F86B51D9DAA0100C2A122 /* FIRStorageViewController.m in Sources */,
 				C3AC675E1D81FE6B00FC956D /* FIRAuthViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -419,7 +409,6 @@
 		};
 		D81A06141B86A78700498183 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 104B66B372B77CFFE53BC90D /* Pods-FirebaseUIChat.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = FirebaseUIChat/Info.plist;
@@ -431,7 +420,6 @@
 		};
 		D81A06151B86A78700498183 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 92E1431893A040764FCC115E /* Pods-FirebaseUIChat.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = FirebaseUIChat/Info.plist;
diff --git a/samples/objc/FirebaseUIChat/Base.lproj/Main.storyboard b/samples/objc/FirebaseUIChat/Base.lproj/Main.storyboard
index 0aca5de7930..5cc3857d985 100644
--- a/samples/objc/FirebaseUIChat/Base.lproj/Main.storyboard
+++ b/samples/objc/FirebaseUIChat/Base.lproj/Main.storyboard
@@ -85,18 +85,18 @@
                                 <rect key="frame" x="0.0" y="92" width="600" height="80"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qVR-uJ-bhD" id="xcz-xR-Hj5">
-                                    <rect key="frame" x="0.0" y="0.0" width="567" height="79"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="567" height="79.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cAY-q4-fwa">
-                                            <rect key="frame" x="15" y="23" width="32" height="20"/>
+                                            <rect key="frame" x="15" y="24" width="31.5" height="19.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SPU-XD-Wjm">
-                                            <rect key="frame" x="15" y="43" width="41" height="14"/>
+                                            <rect key="frame" x="15" y="43.5" width="40.5" height="13.5"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -126,7 +126,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
                         <toolbar key="tableFooterView" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="83E-4Z-ptP">
-                            <rect key="frame" x="0.0" y="631" width="600" height="44"/>
+                            <rect key="frame" x="0.0" y="625.5" width="600" height="44"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                             <items>
                                 <barButtonItem style="plain" systemItem="flexibleSpace" id="o3y-o4-Gpu"/>
@@ -142,14 +142,14 @@
                             <tableViewSection headerTitle="Settings" id="PRj-zg-0nr">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" textLabel="l96-xc-PHH" style="IBUITableViewCellStyleDefault" id="ORf-bf-Sq2">
-                                        <rect key="frame" x="0.0" y="50" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="49.5" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ORf-bf-Sq2" id="roJ-pJ-jY5">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Not Signed In" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="l96-xc-PHH">
-                                                    <rect key="frame" x="15" y="0.0" width="570" height="43"/>
+                                                    <rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -159,10 +159,10 @@
                                         </tableViewCellContentView>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="1sh-pl-VVu">
-                                        <rect key="frame" x="0.0" y="94" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="93.5" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1sh-pl-VVu" id="cPB-dF-hTp">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Use Custom AuthPickerViewController" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="YxK-c8-9q7">
@@ -192,10 +192,10 @@
                             <tableViewSection headerTitle="Name" id="0YA-IY-hOV">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="kCl-ip-jc2">
-                                        <rect key="frame" x="0.0" y="189" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="187.5" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kCl-ip-jc2" id="dm4-D7-IWN">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -204,10 +204,10 @@
                             <tableViewSection headerTitle="Email" id="Y94-bQ-cWH">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="MCw-zF-UTn">
-                                        <rect key="frame" x="0.0" y="284" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="281.5" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="MCw-zF-UTn" id="ea1-oT-1Py">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -216,10 +216,10 @@
                             <tableViewSection headerTitle="UID" id="Yxe-jV-t3o">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="EWm-GE-IZV">
-                                        <rect key="frame" x="0.0" y="379" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="375.5" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EWm-GE-IZV" id="ISG-G9-H8V">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -228,14 +228,14 @@
                             <tableViewSection headerTitle="Provider Access Token" id="E31-4c-QDa">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" textLabel="k9f-GH-UBQ" style="IBUITableViewCellStyleDefault" id="mdj-SS-dqJ">
-                                        <rect key="frame" x="0.0" y="474" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="469.5" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mdj-SS-dqJ" id="oCT-Ra-9l7">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="k9f-GH-UBQ">
-                                                    <rect key="frame" x="15" y="0.0" width="570" height="43"/>
+                                                    <rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -249,14 +249,14 @@
                             <tableViewSection headerTitle="Provider ID Token" id="GaU-wa-aFK">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" textLabel="M61-v5-jhZ" style="IBUITableViewCellStyleDefault" id="b45-X5-eC9">
-                                        <rect key="frame" x="0.0" y="569" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="563.5" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="b45-X5-eC9" id="ofC-qT-5cz">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="M61-v5-jhZ">
-                                                    <rect key="frame" x="15" y="0.0" width="570" height="43"/>
+                                                    <rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
@@ -288,5 +288,69 @@
             </objects>
             <point key="canvasLocation" x="1713" y="315"/>
         </scene>
+        <!--Storage View Controller-->
+        <scene sceneID="in8-Br-kNo">
+            <objects>
+                <viewController storyboardIdentifier="FIRStorageViewController" id="Ne3-90-zlK" customClass="FIRStorageViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="sSp-ee-lWK"/>
+                        <viewControllerLayoutGuide type="bottom" id="6on-da-65M"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="QNh-TG-gxm">
+                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gPR-lg-zcg">
+                                <rect key="frame" x="0.0" y="0.0" width="600" height="554"/>
+                            </imageView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jIg-6e-k6g">
+                                <rect key="frame" x="0.0" y="554" width="600" height="46"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T3i-kj-emg">
+                                        <rect key="frame" x="558" y="8" width="34" height="30"/>
+                                        <state key="normal" title="Load"/>
+                                        <connections>
+                                            <action selector="loadButtonPressed:" destination="Ne3-90-zlK" eventType="touchUpInside" id="FBE-qc-8PX"/>
+                                        </connections>
+                                    </button>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="path/to/image.jpg" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="S2u-gw-VSI">
+                                        <rect key="frame" x="8" y="8" width="542" height="30"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="T3i-kj-emg" secondAttribute="trailing" constant="8" id="38b-KR-UXA"/>
+                                    <constraint firstItem="S2u-gw-VSI" firstAttribute="top" secondItem="jIg-6e-k6g" secondAttribute="top" constant="8" id="GvM-15-TVv"/>
+                                    <constraint firstAttribute="bottom" secondItem="S2u-gw-VSI" secondAttribute="bottom" constant="8" id="QFb-y3-feo"/>
+                                    <constraint firstItem="S2u-gw-VSI" firstAttribute="leading" secondItem="jIg-6e-k6g" secondAttribute="leading" constant="8" id="acL-VH-cXy"/>
+                                    <constraint firstAttribute="bottom" secondItem="T3i-kj-emg" secondAttribute="bottom" constant="8" id="ePV-rw-K1P"/>
+                                    <constraint firstItem="T3i-kj-emg" firstAttribute="top" secondItem="jIg-6e-k6g" secondAttribute="top" constant="8" id="gx6-c4-v4Z"/>
+                                    <constraint firstItem="T3i-kj-emg" firstAttribute="leading" secondItem="S2u-gw-VSI" secondAttribute="trailing" constant="8" id="mWV-X4-36L"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="jIg-6e-k6g" secondAttribute="trailing" id="5al-WH-39Q"/>
+                            <constraint firstItem="jIg-6e-k6g" firstAttribute="leading" secondItem="QNh-TG-gxm" secondAttribute="leading" id="69g-Ku-CEb"/>
+                            <constraint firstItem="jIg-6e-k6g" firstAttribute="top" secondItem="gPR-lg-zcg" secondAttribute="bottom" id="DBx-sa-ORc"/>
+                            <constraint firstItem="6on-da-65M" firstAttribute="top" secondItem="jIg-6e-k6g" secondAttribute="bottom" id="PXV-2o-TF2"/>
+                            <constraint firstItem="gPR-lg-zcg" firstAttribute="top" secondItem="QNh-TG-gxm" secondAttribute="top" id="Uvy-PE-Azh"/>
+                            <constraint firstAttribute="trailing" secondItem="gPR-lg-zcg" secondAttribute="trailing" id="VEL-ce-n24"/>
+                            <constraint firstItem="gPR-lg-zcg" firstAttribute="leading" secondItem="QNh-TG-gxm" secondAttribute="leading" id="ih8-jN-R0R"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="bottomConstraint" destination="PXV-2o-TF2" id="sHN-vS-gJI"/>
+                        <outlet property="imageView" destination="gPR-lg-zcg" id="afJ-DR-Crs"/>
+                        <outlet property="textField" destination="S2u-gw-VSI" id="P2k-jz-POe"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="gKg-8T-yCk" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2377" y="315"/>
+        </scene>
     </scenes>
 </document>
diff --git a/samples/objc/FirebaseUIChat/FIRSamplesViewController.m b/samples/objc/FirebaseUIChat/FIRSamplesViewController.m
index 9c4e02a0795..135953dc274 100644
--- a/samples/objc/FirebaseUIChat/FIRSamplesViewController.m
+++ b/samples/objc/FirebaseUIChat/FIRSamplesViewController.m
@@ -57,6 +57,14 @@ - (void)populateSamples {
                                                                   bundle:NULL] instantiateViewControllerWithIdentifier:@"ViewController"];
                                        return controller;
                                      }]];
+  [samples addObject:[FIRSample sampleWithTitle:@"Storage"
+                              sampleDescription:@"Demonstrates using FirebaseStorageUI to populate an image view."
+                                     controller:^UIViewController *{
+                                       UIViewController *controller =
+                                       [[UIStoryboard storyboardWithName:@"Main"
+                                                                  bundle:NULL] instantiateViewControllerWithIdentifier:@"FIRStorageViewController"];
+                                       return controller;
+                                     }]];
 
   _samplesContainer = samples;
 }
diff --git a/samples/objc/FirebaseUIChat/Samples/Storage/FIRStorageViewController.h b/samples/objc/FirebaseUIChat/Samples/Storage/FIRStorageViewController.h
new file mode 100644
index 00000000000..3ec20c48da0
--- /dev/null
+++ b/samples/objc/FirebaseUIChat/Samples/Storage/FIRStorageViewController.h
@@ -0,0 +1,23 @@
+//
+//  AuthViewController.h
+//
+//  Copyright (c) 2016 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface FIRStorageViewController : UIViewController
+
+@end
diff --git a/samples/objc/FirebaseUIChat/Samples/Storage/FIRStorageViewController.m b/samples/objc/FirebaseUIChat/Samples/Storage/FIRStorageViewController.m
new file mode 100644
index 00000000000..2a1c17145b3
--- /dev/null
+++ b/samples/objc/FirebaseUIChat/Samples/Storage/FIRStorageViewController.m
@@ -0,0 +1,112 @@
+//
+//  AuthViewController.h
+//
+//  Copyright (c) 2016 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//  http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import "FIRStorageViewController.h"
+
+#import <FirebaseStorage/FirebaseStorage.h>
+#import <FirebaseStorageUI/FirebaseStorageUI.h>
+
+@interface FIRStorageViewController ()
+@property (nonatomic, strong) IBOutlet UIImageView *imageView;
+@property (nonatomic, strong) IBOutlet UITextField *textField;
+
+/// Used to move the view's contents when the keyboard appears.
+@property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstraint;
+@end
+
+@implementation FIRStorageViewController
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+  self.imageView.contentMode = UIViewContentModeScaleAspectFit;
+  self.textField.autocapitalizationType = UITextAutocapitalizationTypeNone;
+  self.textField.autocorrectionType = UITextAutocorrectionTypeNo;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+  [super viewDidAppear:animated];
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(keyboardWillShow:)
+                                               name:UIKeyboardWillShowNotification
+                                             object:nil];
+  [[NSNotificationCenter defaultCenter] addObserver:self
+                                           selector:@selector(keyboardWillHide:)
+                                               name:UIKeyboardWillHideNotification
+                                             object:nil];
+}
+
+- (void)viewDidDisappear:(BOOL)animated {
+  [super viewDidDisappear:animated];
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (IBAction)loadButtonPressed:(id)sender {
+  self.imageView.image = nil;
+  if (self.textField.text == nil) return;
+  NSURL *url = [NSURL URLWithString:self.textField.text];
+  if (url == nil) return;
+
+  FIRStorageReference *storageRef = [[FIRStorage storage]
+    referenceWithPath:url.path ?: @""];
+
+  [self.imageView sd_setImageWithStorageReference:storageRef
+                                 placeholderImage:nil
+                                       completion:^(UIImage *image,
+                                                    NSError *error,
+                                                    SDImageCacheType
+                                                    cacheType,
+                                                    FIRStorageReference *ref) {
+    if (error != nil) {
+      NSLog(@"Error loading image: %@", error.localizedDescription);
+    }
+  }];
+}
+
+#pragma mark - Keyboard boilerplate
+
+- (void)keyboardWillShow:(NSNotification *)notification {
+  NSDictionary *userInfo = notification.userInfo;
+  NSValue *endFrameValue = userInfo[UIKeyboardFrameEndUserInfoKey];
+  CGFloat endHeight = endFrameValue.CGRectValue.size.height;
+
+  self.bottomConstraint.constant = endHeight;
+
+  UIViewAnimationCurve curve = [userInfo[UIKeyboardAnimationCurveUserInfoKey] integerValue];
+  NSTimeInterval duration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
+
+  [UIView setAnimationCurve:curve];
+  [UIView animateWithDuration:duration animations:^{
+    [self.view layoutIfNeeded];
+  }];
+}
+
+- (void)keyboardWillHide:(NSNotification *)notification {
+  NSDictionary *userInfo = notification.userInfo;
+
+  self.bottomConstraint.constant = 0;
+
+  UIViewAnimationCurve curve = [userInfo[UIKeyboardAnimationCurveUserInfoKey] integerValue];
+  NSTimeInterval duration = [userInfo[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
+
+  [UIView setAnimationCurve:curve];
+  [UIView animateWithDuration:duration animations:^{
+    [self.view layoutIfNeeded];
+  }];
+}
+
+@end
diff --git a/samples/objc/Podfile b/samples/objc/Podfile
index e93bcb87fff..8ed681cb45d 100644
--- a/samples/objc/Podfile
+++ b/samples/objc/Podfile
@@ -5,6 +5,7 @@ target 'FirebaseUIChat' do
 #  used for development from sources
   pod 'FirebaseAuthUI', :path => "../../FirebaseUI_dev_auth.podspec"
   pod 'FirebaseDatabaseUI', :path => "../../FirebaseUI_dev_db.podspec"
+  pod 'FirebaseStorageUI', :path => "../../FirebaseUI_dev_storage.podspec"
   pod 'FirebaseFacebookAuthUI', :path => "../../FirebaseUI_dev_fb.podspec"
   pod 'FirebaseGoogleAuthUI', :path => "../../FirebaseUI_dev_ggl.podspec"
   pod 'FirebaseTwitterAuthUI', :path => "../../FirebaseUI_dev_tw.podspec"
@@ -14,4 +15,3 @@ target 'FirebaseUIChat' do
 #  pod 'FirebaseUI', :podspec => "../../FirebaseUI.podspec"
 
 end
-