diff --git a/app/build.gradle b/app/build.gradle
index 43bb6f5..057d9df 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,13 +20,19 @@ android {
         }
     }
 
-    // TODO This for anyone following along with the repo. Since you will have a different
-    // root URL, this code loads up a value from your gradle.properties file.
+    /* This for anyone following along with the repo. Since you will have a different
+     * root URL, this code loads up a value from your gradle.properties file.
+     */
+
     buildTypes.each {
         it.buildConfigField 'String', 'UNIQUE_FIREBASE_ROOT_URL', UniqueFirebaseRootUrl
     }
 
-    // TODO Step 1: Add the packaging options here
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE-FIREBASE.txt'
+        exclude 'META-INF/NOTICE'
+    }
 
 }
 
@@ -37,7 +43,7 @@ dependencies {
     compile 'com.android.support:support-v4:23.0.1'
     compile 'com.android.support:cardview-v7:23.0.1'
 
-    // TODO Step 1: Add the Firebase library here
+    compile 'com.firebase:firebase-client-android:2.4.0'
 
     /* For Google Play Services */
     compile 'com.google.android.gms:play-services-safetynet:8.3.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index baa536d..45bb91e 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.udacity.firebase.shoppinglistplusplus">
 
-    <!-- TODO Step 2: Add the correct app permission(s) for Firebase here -->
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name="com.udacity.firebase.shoppinglistplusplus.ShoppingListApplication"
diff --git a/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/ShoppingListApplication.java b/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/ShoppingListApplication.java
index 73849db..9038857 100755
--- a/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/ShoppingListApplication.java
+++ b/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/ShoppingListApplication.java
@@ -1,5 +1,7 @@
 package com.udacity.firebase.shoppinglistplusplus;
 
+import com.firebase.client.Firebase;
+
 /**
  * Includes one-time initialization of Firebase related code
  */
@@ -8,7 +10,8 @@ public class ShoppingListApplication extends android.app.Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        // TODO Step 3: Initialize Firebase
+        /* Initialize Firebase */
+        Firebase.setAndroidContext(this);
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/utils/Constants.java b/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/utils/Constants.java
index 1ac8520..160a179 100755
--- a/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/utils/Constants.java
+++ b/app/src/main/java/com/udacity/firebase/shoppinglistplusplus/utils/Constants.java
@@ -1,5 +1,7 @@
 package com.udacity.firebase.shoppinglistplusplus.utils;
 
+import com.udacity.firebase.shoppinglistplusplus.BuildConfig;
+
 /**
  * Constants class store most important strings and paths of the app
  */
@@ -19,7 +21,7 @@ public final class Constants {
     /**
      * Constants for Firebase URL
      */
-    //TODO Step 4: Set up a constant for the Firebase URL here.
+    public static final String FIREBASE_URL = BuildConfig.UNIQUE_FIREBASE_ROOT_URL;
 
 
     /**