diff --git a/.travis.yml b/.travis.yml
index bf0e628..7846173 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: java
 jdk: oraclejdk7
-notifications:
-  email: false
 branches:
   excludes:
       - gh-pages
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index d38f443..49299cf 100755
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  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.
+  -->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.cmput301.recipebot"
           android:versionCode="100"
@@ -9,6 +28,9 @@
             android:minSdkVersion="8"
             android:targetSdkVersion="16"/>
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+
     <application
             android:name=".RecipeBotApplication"
             android:icon="@drawable/icon"
@@ -30,22 +52,10 @@
         </activity>
 
         <activity
-                android:name=".ui.AddPantryItemActivity"
-                android:configChanges="orientation|keyboardHidden|screenSize"
-                android:label="@string/activity_add_pantry_item_title"/>
-                -->
-        <activity
-                android:name=".ui.AddRecipe"
-                android:label="@string/app_name">
-            <!--
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN"/>
-
-            <category android:name="android.intent.category.LAUNCHER"/>
-
-            <category android:name="android.intent.category.DEFAULT"/>
-        </intent-filter>                  -->
+                android:name=".ui.RecipeActivity"
+                android:configChanges="orientation|keyboardHidden|screenSize" android:label="@string/app_name">
         </activity>
+
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/pom.xml b/app/pom.xml
index 6934fdb..c45ab8a 100755
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -75,12 +75,23 @@
             <artifactId>otto</artifactId>
             <version>1.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>com.nostra13.universalimageloader</groupId>
+            <artifactId>universal-image-loader</artifactId>
+            <version>1.8.2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.easytesting</groupId>
+            <artifactId>fest-assert-core</artifactId>
+            <version>2.0M10</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-library</artifactId>
diff --git a/app/res/drawable-hdpi/buttonimage.jpg b/app/res/drawable-hdpi/buttonimage.jpg
deleted file mode 100644
index 115017b..0000000
Binary files a/app/res/drawable-hdpi/buttonimage.jpg and /dev/null differ
diff --git a/app/res/drawable-nodpi/test_recipe_image_1.jpg b/app/res/drawable-nodpi/test_recipe_image_1.jpg
deleted file mode 100644
index 9e56cc9..0000000
Binary files a/app/res/drawable-nodpi/test_recipe_image_1.jpg and /dev/null differ
diff --git a/app/res/drawable-nodpi/test_recipe_image_2.jpg b/app/res/drawable-nodpi/test_recipe_image_2.jpg
deleted file mode 100644
index 2175737..0000000
Binary files a/app/res/drawable-nodpi/test_recipe_image_2.jpg and /dev/null differ
diff --git a/app/res/drawable-nodpi/test_recipe_image_3.jpg b/app/res/drawable-nodpi/test_recipe_image_3.jpg
deleted file mode 100644
index a640c1c..0000000
Binary files a/app/res/drawable-nodpi/test_recipe_image_3.jpg and /dev/null differ
diff --git a/app/res/drawable-nodpi/test_recipe_image_4.jpg b/app/res/drawable-nodpi/test_recipe_image_4.jpg
deleted file mode 100644
index 015a152..0000000
Binary files a/app/res/drawable-nodpi/test_recipe_image_4.jpg and /dev/null differ
diff --git a/app/res/drawable-nodpi/test_recipe_image_5.jpg b/app/res/drawable-nodpi/test_recipe_image_5.jpg
deleted file mode 100644
index 15fd219..0000000
Binary files a/app/res/drawable-nodpi/test_recipe_image_5.jpg and /dev/null differ
diff --git a/app/res/drawable-nodpi/test_recipe_image_6.jpg b/app/res/drawable-nodpi/test_recipe_image_6.jpg
deleted file mode 100644
index 973d186..0000000
Binary files a/app/res/drawable-nodpi/test_recipe_image_6.jpg and /dev/null differ
diff --git a/app/res/layout/activity_main.xml b/app/res/layout/activity_main.xml
index 80b9d0a..00a1b55 100644
--- a/app/res/layout/activity_main.xml
+++ b/app/res/layout/activity_main.xml
@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
+<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+                                   android:id="@+id/pager"
+                                   android:layout_width="match_parent"
+                                   android:layout_height="match_parent">
 
-    <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="hello"/>
-
-</LinearLayout>
\ No newline at end of file
+</android.support.v4.view.ViewPager>
\ No newline at end of file
diff --git a/app/res/layout/activity_recipe.xml b/app/res/layout/activity_recipe.xml
new file mode 100644
index 0000000..6b827e6
--- /dev/null
+++ b/app/res/layout/activity_recipe.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  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.
+  -->
+
+<com.cmput301.recipebot.ui.views.VerticalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+                                                    android:orientation="vertical"
+                                                    android:layout_width="match_parent"
+                                                    android:layout_height="match_parent">
+
+    <LinearLayout android:orientation="vertical"
+                  android:layout_width="match_parent"
+                  android:layout_height="match_parent">
+
+        <android.support.v4.view.ViewPager
+                android:id="@+id/pager_recipe_images"
+                android:layout_width="fill_parent"
+                android:layout_height="100dp"
+                />
+
+        <EditText
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/editText_recipe_title"
+                android:layout_gravity="left|center_vertical"/>
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content">
+
+            <EditText
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/editText_ingredients"
+                    android:layout_gravity="left|center_vertical"/>
+
+            <ImageButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@android:drawable/ic_input_add"
+                    android:id="@+id/button_add_ingredient"
+                    android:layout_gravity="right|center_vertical"/>
+
+        </LinearLayout>
+
+        <ListView android:layout_width="match_parent"
+                  android:id="@+id/list_ingredients"
+                  android:layout_weight="1"
+                  android:layout_height="0dp"/>
+
+        <LinearLayout android:orientation="horizontal"
+                      android:layout_width="match_parent"
+                      android:layout_height="wrap_content">
+
+            <EditText
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/editText_directions"
+                    android:layout_gravity="left|center_vertical"/>
+
+            <ImageButton
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@android:drawable/ic_input_add"
+                    android:id="@+id/button_add_direction"
+                    android:layout_gravity="right|center_vertical"/>
+
+        </LinearLayout>
+
+        <ListView android:layout_width="match_parent"
+                  android:id="@+id/list_directions"
+                  android:layout_weight="1"
+                  android:layout_height="0dp"/>
+
+    </LinearLayout>
+
+</com.cmput301.recipebot.ui.views.VerticalScrollView>
\ No newline at end of file
diff --git a/app/res/layout/add_recipe.xml b/app/res/layout/add_recipe.xml
deleted file mode 100644
index 6295e10..0000000
--- a/app/res/layout/add_recipe.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"      >
-        <!--android:theme="Theme.Black"> -->
-
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                  android:id="@+id/linearLayout"
-                  android:orientation="vertical"
-                  android:layout_width="fill_parent"
-                  android:layout_height="wrap_content"
-
-
-            >
-        <!--
-      <android.support.v4.view.ViewPager
-                android:id="@+id/pager"
-                android:layout_width="fill_parent"
-                android:layout_height="250dp"
-                android:layout_weight="1"
-                />
-
-        <com.viewpagerindicator.CirclePageIndicator
-                android:id="@+id/indicator"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:padding="10dip" />  -->
-       <!-- <com.cmput301.recipebot.ui.PagerContainer
-                android:id="@+id/pager_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="#CCC">       -->
-
-           <!-- <android.support.v4.view.ViewPager
-                    android:id="@+id/viewPager"
-                    android:layout_width="150dp"
-                    android:layout_height="150dp"
-                    android:layout_gravity="center_horizontal" />     -->
-       <!-- </com.cmput301.recipebot.ui.PagerContainer> -->
-
-        <ImageButton
-                android:id="@+id/ImageButton"
-                android:layout_width="330dp"
-                android:layout_height="wrap_content"
-
-                android:contentDescription="Add Image"
-                android:src="@drawable/buttonimage" android:layout_gravity="center"/>
-        <!--
-        <HorizontalScrollView
-                android:id="@+id/hscroll"
-                android:layout_width="900dp"
-                android:layout_height="200dp" android:fillViewport="false">
-
-            <GridLayout
-                    android:layout_width="900dp"
-                    android:layout_height="200dp" android:layout_gravity="center"
-                  >
-                  -->
-        <!--
-                android:layout_alignBottom="@+id/scrollView"/> -->
-
-        <!--
-        <ScrollView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/scrollView" android:layout_alignParentRight="true"
-                android:layout_alignParentBottom="true"/>                      -->
-        <!--</GridLayout> =-->
-        <!-- </HorizontalScrollView>      -->
-
-        <TextView
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="Ingredients:"
-                />
-
-        <EditText
-                android:id="@+id/IngredientID"
-                android:layout_width="fill_parent"
-                android:layout_height="110dp"
-                android:hint="Insert Ingredients Needed"
-                android:background="@android:color/transparent"
-                android:textSize="16dp"
-                >
-        </EditText>
-        <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/imageView" android:layout_gravity="right|center_vertical"/>
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Instructions:"
-                android:id="@+id/textView" android:layout_gravity="left"/>
-        <EditText
-                android:id="@+id/InstructionID"
-                android:layout_width="fill_parent"
-                android:layout_height="110dp"
-                android:hint="Add Instructions"
-                android:background="@android:color/transparent"
-                android:textSize="16dp"
-                />
-        <GridLayout
-                android:orientation="vertical"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent">
-            <Button
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:text="Share"
-                    android:id="@+id/PublishButton" android:layout_row="0" android:layout_column="1"/>
-            <Button
-                    android:layout_width="150dp"
-                    android:layout_height="wrap_content"
-                    android:text="Save"
-                    android:id="@+id/SaveButton"
-                    android:layout_row="0" android:layout_column="3"/>
-        </GridLayout>
-
-
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/app/res/layout/cell.xml b/app/res/layout/cell.xml
deleted file mode 100644
index 9a3843b..0000000
--- a/app/res/layout/cell.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:id="@+id/linearLayout1"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:orientation="vertical" >
-
-    <ImageView android:id="@+id/buttonimage"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"/>
-
-    <TextView android:id="@+id/_imageName"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              android:layout_gravity="center_horizontal"/>
-
-    <EditText android:id="@+id/eText"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
-              />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/email_entry.xml b/app/res/layout/email_entry.xml
deleted file mode 100644
index b68b6d8..0000000
--- a/app/res/layout/email_entry.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <EditText android:hint="Enter Email"
-              android:id="@+id/emailaddress"
-              android:layout_height="wrap_content"
-              android:layout_width="wrap_content"></EditText>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/fragment_pantry_header.xml b/app/res/layout/fragment_pantry_header.xml
new file mode 100644
index 0000000..1f5ec3b
--- /dev/null
+++ b/app/res/layout/fragment_pantry_header.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="horizontal"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content">
+
+    <EditText
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:id="@+id/editText_pantry"
+            android:layout_gravity="left|center_vertical"/>
+
+    <ImageButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@android:drawable/ic_input_add"
+            android:id="@+id/button_add_pantry"
+            android:layout_gravity="right|center_vertical"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/fragment_saved_recipes.xml b/app/res/layout/fragment_saved_recipes.xml
index 0cc47de..de04332 100644
--- a/app/res/layout/fragment_saved_recipes.xml
+++ b/app/res/layout/fragment_saved_recipes.xml
@@ -3,12 +3,9 @@
           android:id="@+id/gridview"
           android:layout_width="fill_parent"
           android:layout_height="fill_parent"
-          android:columnWidth="250dp"
-          android:numColumns="auto_fit"
-          android:verticalSpacing="20dp"
-          android:horizontalSpacing="20dp"
-          android:stretchMode="columnWidth"
           android:gravity="center"
-
-
-        />
\ No newline at end of file
+          android:horizontalSpacing="4dip"
+          android:numColumns="3"
+          android:stretchMode="columnWidth"
+          android:verticalSpacing="4dip"
+          android:padding="4dip" />
\ No newline at end of file
diff --git a/app/res/layout/item_pantry.xml b/app/res/layout/item_pantry.xml
new file mode 100644
index 0000000..02fdda5
--- /dev/null
+++ b/app/res/layout/item_pantry.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  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.
+  -->
+
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:id="@+id/checkBox"
+          android:layout_gravity="left|center_vertical"/>
\ No newline at end of file
diff --git a/app/res/layout/item_recipe_image.xml b/app/res/layout/item_recipe_image.xml
new file mode 100644
index 0000000..8e515b0
--- /dev/null
+++ b/app/res/layout/item_recipe_image.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  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.
+  -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+           android:id="@+id/recipe_image"
+           android:layout_width="fill_parent"
+           android:layout_height="120dip"
+           android:adjustViewBounds="true"
+           android:scaleType="centerCrop"/>
\ No newline at end of file
diff --git a/app/res/layout/pager_item_recipe_image.xml b/app/res/layout/pager_item_recipe_image.xml
new file mode 100644
index 0000000..86ad7f4
--- /dev/null
+++ b/app/res/layout/pager_item_recipe_image.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~  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.
+  -->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+           android:id="@+id/recipe_image"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"
+           android:adjustViewBounds="true"
+           android:scaleType="centerCrop"/>
\ No newline at end of file
diff --git a/app/res/menu/recipe_share.xml b/app/res/menu/recipe_share.xml
deleted file mode 100644
index 90164d2..0000000
--- a/app/res/menu/recipe_share.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/menu_item_share"
-          android:showAsAction="ifRoom|withText"
-          android:title="Share"
-          android:actionProviderClass="android.widget.ShareActionProvider" />
-
-</menu>
\ No newline at end of file
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index c04a2e0..51acf6b 100755
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~ Copyright 2013 Brian Trinh
+  ~ Copyright 2013 Ethan Mykytiuk
+  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~ 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.
+  -->
+
 <resources>
 
     <!-- A light Holo shade of blue -->
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
new file mode 100644
index 0000000..a035003
--- /dev/null
+++ b/app/res/values/dimens.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~ Copyright 2013 Brian Trinh
+  ~ Copyright 2013 Ethan Mykytiuk
+  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~ 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.
+  -->
+
+<resources>
+
+</resources>
\ No newline at end of file
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index cad6b68..689b3b5 100755
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -2,21 +2,21 @@
 
 <!--
   ~ Copyright 2013 Adam Saturna
-  ~ Copyright 2013 Brian Trinh
-  ~ Copyright 2013 Ethan Mykytiuk
-  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~  Copyright 2013 Brian Trinh
+  ~  Copyright 2013 Ethan Mykytiuk
+  ~  Copyright 2013 Prateek Srivastava (@f2prateek)
   ~
-  ~ 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
+  ~  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
+  ~      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.
+  ~  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.
   -->
 
 <resources>
@@ -29,6 +29,7 @@
 
     <!-- Pantry Fragment !-->
     <string name="fragment_pantry_title">Pantry</string>
+    <string name="select_all">SELECT ALL</string>
 
     <!-- Saved Recipes Fragment !-->
     <string name="fragment_saved_recipes_title">Saved Recipes</string>
@@ -41,5 +42,10 @@
     <string name="add">Add</string>
     <string name="no_pantry_items">Pantry is Empty!</string>
     <string name="no_saved_recipes">No Saved Recipes</string>
+    <string name="descr_image">Recipe image</string>
+    <string name="recipe_title_hint">Recipe Title</string>
+    <string name="hint_edit_text_pantry">Add Pantry Item</string>
+    <string name="description_button">Button</string>
+    <string name="recipe_title">Recipe Title</string>
 
 </resources>
\ No newline at end of file
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
new file mode 100644
index 0000000..a035003
--- /dev/null
+++ b/app/res/values/styles.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright 2013 Adam Saturna
+  ~ Copyright 2013 Brian Trinh
+  ~ Copyright 2013 Ethan Mykytiuk
+  ~ Copyright 2013 Prateek Srivastava (@f2prateek)
+  ~
+  ~ 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.
+  -->
+
+<resources>
+
+</resources>
\ No newline at end of file
diff --git a/app/res/values/theme.xml b/app/res/values/theme.xml
index ec6b77b..367a11e 100755
--- a/app/res/values/theme.xml
+++ b/app/res/values/theme.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+~ Copyright 2013 Adam Saturna
+~ Copyright 2013 Brian Trinh
+~ Copyright 2013 Ethan Mykytiuk
+~ Copyright 2013 Prateek Srivastava (@f2prateek)
+~
+~ 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.
+-->
+
 <resources>
 
     <!--
diff --git a/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java b/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
index e0054e6..f2eb801 100755
--- a/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
+++ b/app/src/main/java/com/cmput301/recipebot/RecipeBotApplication.java
@@ -1,22 +1,20 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * Copyright 2012 Donn Felker
+ *  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
  *
- * 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
  *
- *    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.
+ *  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.
  */
 
 package com.cmput301.recipebot;
@@ -27,8 +25,15 @@
 import com.github.kevinsawicki.http.HttpRequest;
 import com.google.inject.Injector;
 import com.google.inject.Stage;
+import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiscCache;
+import com.nostra13.universalimageloader.core.DisplayImageOptions;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.nostra13.universalimageloader.utils.StorageUtils;
 import roboguice.RoboGuice;
 
+import java.io.File;
+
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES.FROYO;
 
@@ -61,6 +66,26 @@ public void onCreate() {
         super.onCreate();
 
         setApplicationInjector(this);
+
+        buildImageCache();
+    }
+
+    private void buildImageCache() {
+        File cacheDir = StorageUtils.getCacheDirectory(getApplicationContext());
+
+        DisplayImageOptions defaultOptions = new DisplayImageOptions.Builder()
+                .cacheInMemory()
+                .cacheOnDisc()
+                .showImageForEmptyUri(android.R.drawable.ic_menu_report_image)
+                .build();
+
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(getApplicationContext())
+                .defaultDisplayImageOptions(defaultOptions)
+                .discCache(new UnlimitedDiscCache(cacheDir))
+                .memoryCacheExtraOptions(250, 300)
+                .build();
+
+        ImageLoader.getInstance().init(config);
     }
 
     /**
diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
index db1f2e5..716754b 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESClient.java
@@ -1,42 +1,53 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.client;
 
+import com.cmput301.recipebot.model.Ingredient;
 import com.cmput301.recipebot.model.Recipe;
 import com.github.kevinsawicki.http.HttpRequest;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
+import java.io.IOException;
 import java.lang.reflect.Type;
-import java.net.HttpURLConnection;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.cmput301.recipebot.util.LogUtils.makeLogTag;
 
 /**
  * The client class that communicates with our server.
  */
 public class ESClient {
 
+    private static final String LOGTAG = makeLogTag(ESClient.class);
     private static final String SERVER_URL = "http://cmput301.softwareprocess.es:8080";
-    private static final String TEAM_URL = "/cmput301w13t06";
-    private static final String LAB_URL = "/lab01";
-    private static final String BASE_URL = SERVER_URL + TEAM_URL + LAB_URL;
-    private static final String GET_RECIPE_BASE_URL = BASE_URL + "/%d";
+    private static final String CLIENT_INDEX = "test-cmput301w13t06";// "cmput301w13t06";
+    private static final String TYPE_RECIPE = "recipe";
+    private static final String METHOD_SEARCH = "_search";
+
+    private final Gson gson;
+
+    public ESClient() {
+        gson = new Gson();
+    }
 
     /**
      * Get the recipe from the server
@@ -44,10 +55,9 @@ public class ESClient {
      * @param id The id of the recipe to retrieve.
      * @return Recipe with the given id
      */
-    public static Recipe getRecipe(int id) {
-        String response = HttpRequest.get(String.format(GET_RECIPE_BASE_URL, id)).
+    public Recipe getRecipe(String id) {
+        String response = HttpRequest.get(getRecipeUrl(id)).
                 accept("application/json").body();
-        Gson gson = new Gson();
         Type elasticSearchResponseType = new TypeToken<ESResponse<Recipe>>() {
         }.getType();
         ESResponse<Recipe> esResponse = gson.fromJson(response, elasticSearchResponseType);
@@ -61,10 +71,105 @@ public static Recipe getRecipe(int id) {
      * @param recipe The recipe to insert.
      * @return True if operation was successful, false otherwise.
      */
-    public static boolean insertRecipe(Recipe recipe) {
-        Gson gson = new Gson();
-        HttpRequest httpPost = HttpRequest.post(String.format(GET_RECIPE_BASE_URL, recipe.getId())).send(gson.toJson(recipe));
-        return httpPost.code() == HttpURLConnection.HTTP_OK;
+    public boolean insertRecipe(Recipe recipe) {
+        HttpRequest httpPost = HttpRequest.post(getRecipeUrl(recipe.getId())).send(gson.toJson(recipe));
+        return httpPost.ok();
+    }
+
+    /**
+     * Update a recipe to the server.
+     * TODO : Actually do an update, right now it just does a force pushe.
+     *
+     * @param recipe The recipe to insert.
+     * @return True if operation was successful, false otherwise.
+     */
+    public boolean updateRecipe(Recipe recipe) {
+        return insertRecipe(recipe);
+    }
+
+    /**
+     * Delete a recipe from the server
+     *
+     * @return True if operation was successful, false otherwise.
+     */
+    public boolean deleteRecipe(String id) {
+        HttpRequest httpDelete = HttpRequest.delete(getRecipeUrl(id));
+        return httpDelete.ok();
+    }
+
+    /**
+     * Search for all recipes with the given name.
+     *
+     * @param name The name of the recipe to search for.
+     * @return List of recipes that have these ingredients.
+     */
+    public List<Recipe> searchRecipes(String name) throws IOException {
+        HttpRequest httpSearch = HttpRequest.get(getRecipeSearchUrl(), true, "q", "name:" + name).accept("application/json");
+        return getRecipesFromResponse(httpSearch.body());
+    }
+
+    private List<Recipe> getRecipesFromResponse(String response) {
+        Type esSearchResponseType = new TypeToken<ESSearchResponse<Recipe>>() {
+        }.getType();
+        ESSearchResponse<Recipe> esSearchResponse = gson.fromJson(response, esSearchResponseType);
+        List<Recipe> recipes = new ArrayList<Recipe>();
+        for (ESResponse<Recipe> r : esSearchResponse.getHits()) {
+            Recipe recipe = r.getSource();
+            recipes.add(recipe);
+        }
+        return recipes;
+    }
+
+    /**
+     * Search for all recipes with the given Ingredients.
+     * It only searches by the name of the ingredient, not its units or quantity.
+     *
+     * @param ingredients The ingredients to search for.
+     * @param matchAll    Whether to only show recipes that have every ingredient.
+     * @return List of recipes that have these ingredients.
+     */
+    public List<Recipe> searchRecipes(List<Ingredient> ingredients, boolean matchAll) {
+        String operator = matchAll ? " AND " : " OR ";
+        String query = "ingredients.name:";
+        for (Ingredient i : ingredients) {
+            query = query + i.getName() + operator;
+        }
+        query = query.substring(0, query.length() - operator.length());
+        HttpRequest httpSearch = HttpRequest.get(getRecipeSearchUrl(), true, "q", query).accept("application/json");
+        System.out.println(httpSearch.toString());
+        return getRecipesFromResponse(httpSearch.body());
+    }
+
+    /**
+     * URL for a specific URL
+     *
+     * @param id ID whose recipe we need
+     * @return the Recipe's url
+     */
+    public static String getRecipeUrl(String id) {
+        return getRecipesUrl() + "/" + id;
+    }
+
+    /**
+     * Get the Recipe URL
+     *
+     * @return Recipe URL
+     */
+    public static String getRecipesUrl() {
+        return getIndexUrl() + "/" + TYPE_RECIPE;
+    }
+
+    public static String getRecipeSearchUrl() {
+        return getRecipesUrl() + "/" + METHOD_SEARCH;
+    }
+
+    /**
+     * Get the url for our index.
+     *
+     * @return Index URL
+     */
+    public static String getIndexUrl() {
+        return SERVER_URL + "/" + CLIENT_INDEX;
     }
 
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java b/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java
index b52843d..f7be9cf 100644
--- a/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESResponse.java
@@ -22,6 +22,7 @@
 /**
  * A wrapper class for response from ElasticSearch
  * Fields are mappings of a query retrieval from ElasticSearch.
+ *
  * @param <T> the data that is wrapped in this response
  */
 public class ESResponse<T> {
@@ -36,6 +37,7 @@ public class ESResponse<T> {
 
     /**
      * Get the object associated with this repsonse.
+     *
      * @return Object of type T
      */
     public T getSource() {
diff --git a/app/src/main/java/com/cmput301/recipebot/client/ESSearchResponse.java b/app/src/main/java/com/cmput301/recipebot/client/ESSearchResponse.java
new file mode 100644
index 0000000..a6773f6
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/client/ESSearchResponse.java
@@ -0,0 +1,28 @@
+package com.cmput301.recipebot.client;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class ESSearchResponse<T> {
+    int took;
+    boolean timed_out;
+    transient Object _shards;
+    Hits<T> hits;
+    boolean exists;
+
+    public Collection<ESResponse<T>> getHits() {
+        return hits.getHits();
+    }
+
+    public Collection<T> getSources() {
+        Collection<T> out = new ArrayList<T>();
+        for (ESResponse<T> essrt : getHits()) {
+            out.add(essrt.getSource());
+        }
+        return out;
+    }
+
+    public String toString() {
+        return (super.toString() + ":" + took + "," + _shards + "," + exists + "," + hits);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/client/Hits.java b/app/src/main/java/com/cmput301/recipebot/client/Hits.java
new file mode 100644
index 0000000..b4d8f0e
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/client/Hits.java
@@ -0,0 +1,17 @@
+package com.cmput301.recipebot.client;
+
+import java.util.Collection;
+
+public class Hits<T> {
+    int total;
+    double max_score;
+    Collection<ESResponse<T>> hits;
+
+    public Collection<ESResponse<T>> getHits() {
+        return hits;
+    }
+
+    public String toString() {
+        return (super.toString() + "," + total + "," + max_score + "," + hits);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
new file mode 100644
index 0000000..e3eeaa7
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/model/DbHelper.java
@@ -0,0 +1,410 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
+package com.cmput301.recipebot.model;
+//code from: http://www.youtube.com/watch?v=v61A90qlK9s
+
+/*
+* Method Summary:
+*
+*   public void addRecipe(int id, String writer, String recipe_name, String prep, ArrayList<String> ingr, ArrayList<String> pics) {
+        SQLiteDatabase db = this.getWritableDatabase();
+    public ArrayList<String> loadPantry();
+    public ArrayList<Recipe> loadRecipes();
+    public void editRecipeName(Recipe recipe, String r_name);
+    public void addPantryItem(String food_name);
+    public void removePantryItem(String food_name);
+* */
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+import android.net.Uri;
+import android.provider.BaseColumns;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+public class DbHelper extends SQLiteOpenHelper {
+
+    //Define Database table + column names
+    private static final String TAG = "DbHelper";
+    public static final String DB_NAME = "log.db";
+    public static final int DB_VERSION = 21;
+
+    public static final String INGREDIENTS_TABLE = "ingredients";
+    public static final String I_ID = BaseColumns._ID;
+    public static final String REC_ID = "rec_id";
+    public static final String INGREDIENT = "ingredient";
+
+    public static final String FOODS_TABLE = "foods";
+    public static final String F_NAME = "f_name";
+
+    public static final String RECIPES_TABLE = "recepies";
+    public static final String R_ID = BaseColumns._ID;
+    public static final String R_NAME = "r_name";
+    public static final String WRITER = "writer";
+    public static final String PREP = "prep";
+
+    public static final String HASIMAGES_TABLE = "has_images";
+    public static final String HIT_ID = BaseColumns._ID;
+    public static final String RECIPE = "r_id";
+    public static final String IMAGE_PATH = "image_path";
+
+    public DbHelper(Context context) {
+        super(context, DB_NAME, null, DB_VERSION);
+
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+
+        //FOODS_TABLE
+        String sql1 = String.format("create table %s (%s TEXT primary key)",
+                FOODS_TABLE, F_NAME);
+        Log.d(TAG, "creating FOODS_TABLE");
+        //RECIPES_TABLE
+        String sql2 = String.format("create table %s (%s INTEGER primary key, %s TEXT, %s TEXT, " +
+                "%s TEXT)",
+                RECIPES_TABLE, R_ID, WRITER, R_NAME, PREP);
+
+        //HASIMAGES_TABLE
+        String sql3 = String.format("create table %s (%s INTEGER primary key, %s INTEGER, %s TEXT, " +
+                "foreign key(%s) references %s)",
+                HASIMAGES_TABLE, HIT_ID, RECIPE, IMAGE_PATH, RECIPE, RECIPES_TABLE);
+
+        //INGREDIENTS_TABLE
+        String sql4 = String.format("create table %s (%s INTEGER primary key, %s INTEGER, %s TEXT, " +
+                "foreign key(%s) references %s)",
+                INGREDIENTS_TABLE, I_ID, REC_ID, INGREDIENT, REC_ID, RECIPES_TABLE);
+
+        //Create tables
+        try {
+            db.execSQL(sql1);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + FOODS_TABLE);
+        }
+        try {
+            db.execSQL(sql2);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + RECIPES_TABLE);
+        }
+        try {
+            db.execSQL(sql3);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + HASIMAGES_TABLE);
+        }
+        try {
+            db.execSQL(sql4);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO CREATE TABLE: " + INGREDIENTS_TABLE);
+        }
+    }
+
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        try {
+            db.execSQL("drop table if exists " + FOODS_TABLE);
+            db.execSQL("drop table if exists " + RECIPES_TABLE);
+            db.execSQL("drop table if exists " + HASIMAGES_TABLE);
+            db.execSQL("drop table if exists " + INGREDIENTS_TABLE);
+        } catch (Exception e) {
+            Log.d("dbUPGRADE", "failed to drop all tables");
+        }
+
+        Log.d(TAG, "onUpdate dropped table ALL");
+        this.onCreate(db);
+    }
+    // code from: http://www.androidhive.info/2011/11/android-sqlite-database-tutorial/
+    //returns a list of log entries
+
+    /*
+    * Function returns a list of ingredients
+    * from the user's pantry
+    * */
+    public ArrayList<String> loadPantry() {
+
+        ArrayList<String> logList = new ArrayList<String>();
+        SQLiteDatabase db = this.getReadableDatabase();
+
+        Cursor cursor = db.rawQuery("SELECT * FROM " + FOODS_TABLE, null);
+        if (cursor.moveToFirst()) {
+            try {
+                do {
+                    logList.add(cursor.getString(0));
+                } while (cursor.moveToNext());
+            } catch (Exception e) {
+                Log.e(TAG, "failed to load all Foods from: " + FOODS_TABLE);
+            }
+        }
+        cursor.close();
+        db.close();
+        return logList;
+    }
+
+    /*
+    * Returns all the Recipes that are stored
+    * in the database of a user
+    * */
+    public ArrayList<Recipe> loadRecipes() {
+
+        ArrayList<Recipe> logList = new ArrayList<Recipe>();
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ArrayList<Uri> photos = new ArrayList<Uri>();
+        ArrayList<String> directions = new ArrayList<String>();
+        SQLiteDatabase db = this.getReadableDatabase();
+
+        Cursor cursor = db.rawQuery("SELECT * FROM " + RECIPES_TABLE + " ORDER BY " + R_NAME + " ASC", null);
+        if (cursor.moveToFirst()) {
+            try {
+                do {
+                    //SET RECIPE INFO
+                    Recipe recipe = new Recipe();
+                    recipe.setId(cursor.getString(0));
+                    recipe.setUser(cursor.getString(1));
+                    recipe.setName(cursor.getString(2));
+                    directions.add(cursor.getString(3));
+                    recipe.setDirections(directions);
+
+                    //SET INGREDIENTS
+                    Cursor cursor2 = db.rawQuery("SELECT " + INGREDIENT + " FROM " + INGREDIENTS_TABLE + " WHERE " +
+                            REC_ID + " =" + cursor.getInt(0), null);
+                    if (cursor2.moveToFirst()) {
+                        try {
+                            do {
+                                Ingredient ingredient = new Ingredient(cursor2.getString(0), "", 0);
+                                ingredients.add(ingredient);
+                            } while (cursor2.moveToNext());
+                        } catch (Exception e) {
+                            Log.e(TAG, "failed to load INGREDIENTS from: " + INGREDIENTS_TABLE);
+                        }
+                    }
+                    cursor2.close();
+                    recipe.setIngredients(ingredients);
+
+                    //SET PHOTOS
+                    Cursor cursor3 = db.rawQuery("SELECT " + IMAGE_PATH + " FROM " + HASIMAGES_TABLE + " WHERE " +
+                            RECIPE + " =" + cursor.getInt(0), null);
+                    if (cursor3.moveToFirst()) {
+                        try {
+                            do {
+                                photos.add(Uri.parse(cursor3.getString(0)));
+                            } while (cursor3.moveToNext());
+                        } catch (Exception e) {
+                            Log.e(TAG, "failed to load IMAGES from: " + HASIMAGES_TABLE);
+                        }
+                    }
+                    cursor3.close();
+                    recipe.setPhotos(photos);
+
+
+                    logList.add(recipe);
+                } while (cursor.moveToNext());
+            } catch (Exception e) {
+                Log.e(TAG, "failed to load all Recipes from: " + RECIPES_TABLE);
+            }
+        }
+        cursor.close();
+        db.close();
+        return logList;
+    }
+
+    /*
+    * Adds a recipe to the database
+    * */
+    public void addRecipe(String id, String writer, String recipe_name, String prep, ArrayList<String> ingr, ArrayList<String> pics) {
+        SQLiteDatabase db = this.getWritableDatabase();
+
+        ContentValues values = new ContentValues();
+        values.put(WRITER, writer);
+        values.put(R_NAME, recipe_name);
+        values.put(PREP, prep);
+        values.put(R_ID, id);
+
+        // Inserting Row
+        try {
+            db.insertOrThrow(RECIPES_TABLE, null, values);
+        } catch (Exception e) {
+            Log.e(TAG, "Couldn't put entry into: " + RECIPES_TABLE);
+        }
+
+        ContentValues values2 = new ContentValues();
+        //Insert all the ingredients of the recipe and give it a common id
+        for (int x = 0; x < ingr.size(); x++) {
+            values2.put(INGREDIENT, ingr.get(x));
+            values2.put(REC_ID, id);
+
+            try {
+                db.insertOrThrow(INGREDIENTS_TABLE, null, values2);
+                Log.d(TAG, "try: add ingredient SUCCESS: " + ingr.get(x));
+            } catch (Exception e) {
+                Log.e(TAG, "Couldn't put entry into: " + INGREDIENTS_TABLE + ": " + ingr.get(x));
+            }
+            values2.clear();
+        }
+
+        ContentValues values3 = new ContentValues();
+        //Insert all the pictures of the recipe and give it a common id
+        for (int y = 0; y < pics.size(); y++) {
+            values3.put(IMAGE_PATH, pics.get(y));
+            values3.put(RECIPE, id);
+
+            try {
+                db.insertOrThrow(HASIMAGES_TABLE, null, values3);
+                Log.d(TAG, "try: add photo SUCCESS: " + pics.get(y));
+            } catch (Exception e) {
+                Log.e(TAG, "Couldn't put entry into: " + HASIMAGES_TABLE + ": " + pics.get(y));
+            }
+            values3.clear();
+        }
+        values.clear();
+        db.close();
+    }
+    /*
+    * Edit complex edits different parts of the recipe object
+    * changing the corresponding data in the database as well
+    * as in the passed Recipe object. For Images and Ingredients
+    * upon edit calls, the database deletes any old images or ingredients
+    * and then adds the new ones that are passed to the function
+    * (it is done so for the simplicity of implementation)
+    * */
+
+    //Edits the Recipe Name
+    public void editRecipeName(Recipe recipe, String r_name) {
+        SQLiteDatabase db = this.getWritableDatabase();
+
+        String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + R_NAME + " ='%s'" +
+                " WHERE " + R_ID + " =%s", r_name, recipe.getId());
+        try {
+            db.execSQL(sql1);
+            recipe.setName(r_name);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + recipe.getName());
+        }
+
+        db.close();
+    }
+
+    //Edits the Description/Preparation of a recipe
+    public void editRecipePrep(Recipe recipe, String prep) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ArrayList<String> preparation = new ArrayList<String>();
+        preparation.add(prep);
+
+        //UPDATE RECIPE_TABLE
+        String sql1 = String.format("UPDATE " + RECIPES_TABLE + " SET " + PREP + " ='%s'" +
+                " WHERE " + R_ID + " =%s", prep, recipe.getId());
+        try {
+            db.execSQL(sql1);
+            recipe.setDirections(preparation);
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO UPDATE A RECIPE: " + prep);
+        }
+
+        db.close();
+    }
+
+    //Edits the recipe's ingredients removing old ones first and adding the new ones
+    public void editRecipeIngredients(Recipe recipe, ArrayList<String> ingredients) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues values = new ContentValues(0);
+        ArrayList<Ingredient> ingr = new ArrayList<Ingredient>();
+
+        db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[]{String.valueOf(recipe.getId())});
+
+        for (int x = 0; x < ingredients.size(); x++) {
+
+            values.put(REC_ID, recipe.getId());
+            values.put(INGREDIENT, ingredients.get(x));
+            Ingredient ingredient = new Ingredient(ingredients.get(x), "", 0);
+            ingr.add(ingredient);
+            try {
+                db.insertOrThrow(INGREDIENTS_TABLE, null, values);
+            } catch (Exception e) {
+                Log.e(TAG, "FAILED TO UPDATE INGREDIENT: " + ingredients.get(x));
+            }
+        }
+        recipe.setIngredients(ingr);
+        db.close();
+    }
+
+    //edits the recipe's pictures
+    public void editRecipePictures(Recipe recipe, ArrayList<Uri> photos) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues values = new ContentValues(0);
+        db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[]{String.valueOf(recipe.getId())});
+
+        for (int x = 0; x < photos.size(); x++) {
+            values.put(RECIPE, recipe.getId());
+            values.put(IMAGE_PATH, photos.get(x).toString());
+            try {
+                db.insertOrThrow(HASIMAGES_TABLE, null, values);
+                recipe.setPhotos(photos);
+            } catch (Exception e) {
+                Log.e(TAG, "FAILED TO UPDATE A PICTURE: " + photos.get(x).toString());
+            }
+        }
+
+        db.close();
+    }
+
+    /*
+    *  Given the recipe id, it removes the recipe and all
+    *  corresponding pictures and ingredients
+    * */
+    public void removeRecipe(String r_id) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        try {
+            Log.d(TAG, "removing recipe and depenencies");
+            db.delete(RECIPES_TABLE, R_ID + " = ?", new String[]{r_id});
+            db.delete(INGREDIENTS_TABLE, REC_ID + " = ?", new String[]{r_id});
+            db.delete(HASIMAGES_TABLE, RECIPE + " = ?", new String[]{r_id});
+        } catch (Exception e) {
+            Log.e(TAG, "Couldn't remove a recipe and all db sub trees");
+        }
+        db.close();
+    }
+
+    //Removes a pantry item called food_name
+    public void removePantryItem(String food_name) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        try {
+            db.delete(FOODS_TABLE, F_NAME + " = ?", new String[]{String.valueOf(food_name)});
+        } catch (Exception e) {
+            Log.e(TAG, "FAILED TO REMOVE FROM PANTRY: " + food_name);
+        }
+        db.close();
+    }
+
+    //adds a new item to the user's pantry
+    public void addPantryItem(String food_name) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues value = new ContentValues();
+        value.put(F_NAME, food_name);
+        try {
+            db.insertOrThrow(FOODS_TABLE, null, value);
+        } catch (Exception e) {
+            Log.d(TAG, "FAILED TO ADD A PANTRY ITEM: " + food_name + "(already exists)");
+        }
+        db.close();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java b/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java
index 10d031f..de523c7 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/Ingredient.java
@@ -1,38 +1,66 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.model;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+
 /**
  * An ingredient class. This is used by the {@link Recipe} object to show all ingredients required.
  */
-public class Ingredient extends PantryItem {
+public class Ingredient implements Parcelable {
 
+    private String name;
     private String unit;
     private float quantity;
 
+    public Ingredient() {
+        this.name = null;
+        this.unit = null;
+        this.quantity = 0f;
+    }
+
     public Ingredient(String name, String unit, float quantity) {
-        super(name);
+        this.name = name;
         this.unit = unit;
         this.quantity = quantity;
     }
 
+    /**
+     * Get the name of the item
+     *
+     * @return Name of item.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Set the name of the item.
+     *
+     * @param name Name of item.
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
     /**
      * Returns unit associated with this Ingredient (e.g. 'ml', or 'oz.' or 'nos')
      *
@@ -61,10 +89,39 @@ public void setQuantity(float quantity) {
 
     @Override
     public String toString() {
-        return "Ingredient{" +
-                "name='" + name + '\'' +
-                ", unit='" + unit + '\'' +
-                ", quantity=" + quantity +
-                '}';
+        if (quantity == (int) quantity)
+            return String.format("%d %s of %s", (int) quantity, unit, name);
+        else
+            return String.format("%s %s of %s", quantity, unit, name);
+    }
+
+    //Parcel code
+    protected Ingredient(Parcel in) {
+        this();
+        name = in.readString();
+        unit = in.readString();
+        quantity = in.readFloat();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
     }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(name);
+        dest.writeString(unit);
+        dest.writeFloat(quantity);
+    }
+
+    public static final Parcelable.Creator<Ingredient> CREATOR = new Parcelable.Creator<Ingredient>() {
+        public Ingredient createFromParcel(Parcel in) {
+            return new Ingredient(in);
+        }
+
+        public Ingredient[] newArray(int size) {
+            return new Ingredient[size];
+        }
+    };
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java b/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
deleted file mode 100644
index 1c073d6..0000000
--- a/app/src/main/java/com/cmput301/recipebot/model/PantryItem.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
- *
- * 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.
- */
-
-package com.cmput301.recipebot.model;
-
-/**
- * A class that represents items in the Pantry.
- * For ingredients, use {@link Ingredient}.
- * Match it to an ingredient with its name.
- */
-public class PantryItem {
-
-    protected String name;
-
-    public PantryItem(String name) {
-        this.name = name;
-    }
-
-    /**
-     * Get the name of the item
-     * @return Name of item.
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Set the name of the item.
-     * @param name Name of item.
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return "PantryItem{" +
-                "name='" + name + '\'' +
-                '}';
-    }
-}
diff --git a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
index dac980f..85ddfef 100644
--- a/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
+++ b/app/src/main/java/com/cmput301/recipebot/model/Recipe.java
@@ -1,49 +1,75 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.model;
 
-import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Parcel;
+import android.os.Parcelable;
 
 import java.util.ArrayList;
 
 /**
  * A recipe class.
- * Setter methods undocumented - use {@link Builder} to build objects of this class.
  */
-public class Recipe {
+public class Recipe implements Parcelable {
 
-    private int id;
+    private String id;
+    private String description;
     private String user;
     private String name;
     private ArrayList<Ingredient> ingredients;
     private ArrayList<String> directions;
-    private ArrayList<Bitmap> images;
+    private ArrayList<Uri> photos;
+
+    public Recipe() {
+        this.id = null;
+        this.description = null;
+        this.user = null;
+        this.name = null;
+        this.directions = new ArrayList<String>();
+        this.ingredients = new ArrayList<Ingredient>();
+        this.photos = new ArrayList<Uri>();
+    }
 
-    public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredients,
-                  ArrayList<String> directions, ArrayList<Bitmap> images) {
+    public Recipe(String id, String description, String user, String name, ArrayList<Ingredient> ingredients,
+                  ArrayList<String> directions, ArrayList<Uri> photos) {
         this.id = id;
+        this.description = description;
         this.user = user;
         this.name = name;
         this.ingredients = ingredients;
         this.directions = directions;
-        this.images = images;
+        this.photos = photos;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * Get the description for this Recipe
+     *
+     * @param description
+     */
+    public void setDescription(String description) {
+        this.description = description;
     }
 
     /**
@@ -51,11 +77,11 @@ public Recipe(int id, String user, String name, ArrayList<Ingredient> ingredient
      *
      * @return id of this recipe.
      */
-    public int getId() {
+    public String getId() {
         return id;
     }
 
-    public void setId(int id) {
+    public void setId(String id) {
         this.id = id;
     }
 
@@ -112,66 +138,70 @@ public void setDirections(ArrayList<String> directions) {
     }
 
     /**
-     * Get all images for this recipe.
+     * Get all photoes for this recipe.
      * TODO: consider using a custom Bitmap class, with a boolean unpublished.*
      *
-     * @return Images for this recipe.
+     * @return `photos for this recipe.
      */
-    public ArrayList<Bitmap> getImages() {
-        return images;
+    public ArrayList<Uri> getPhotos() {
+        return photos;
+    }
+
+    public void setPhotos(ArrayList<Uri> photos) {
+        this.photos = photos;
     }
 
-    public void setImage(ArrayList<Bitmap> images) {
-        this.images = images;
+    public void addPhoto(Uri photo) {
+        photos.add(photo);
     }
 
     @Override
     public String toString() {
-        return "Recipe [id=" + id + ", user=" + user + ", name=" + name + ", ingredients="
-                + ingredients + ", directions=" + directions + "]";
+        return "Recipe{" +
+                "directions=" + directions +
+                ", id='" + id + '\'' +
+                ", description='" + description + '\'' +
+                ", user='" + user + '\'' +
+                ", name='" + name + '\'' +
+                ", ingredients=" + ingredients +
+                '}';
     }
 
-    public static class Builder {
-        private int id;
-        private String user;
-        private String name;
-        private ArrayList<Ingredient> ingredients;
-        private ArrayList<String> directions;
-        private ArrayList<Bitmap> images;
-
-        public Builder setId(int id) {
-            this.id = id;
-            return this;
-        }
-
-        public Builder setUser(String user) {
-            this.user = user;
-            return this;
-        }
-
-        public Builder setName(String name) {
-            this.name = name;
-            return this;
-        }
+    @Override
+    public int describeContents() {
+        return 0;
+    }
 
-        public Builder setIngredients(ArrayList<Ingredient> ingredients) {
-            this.ingredients = ingredients;
-            return this;
-        }
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(id);
+        dest.writeString(description);
+        dest.writeString(user);
+        dest.writeString(name);
+        dest.writeStringList(directions);
+        dest.writeTypedList(ingredients);
+        dest.writeTypedList(photos);
+    }
 
-        public Builder setDirections(ArrayList<String> directions) {
-            this.directions = directions;
-            return this;
-        }
+    protected Recipe(Parcel in) {
+        this();
+        id = in.readString();
+        description = in.readString();
+        user = in.readString();
+        name = in.readString();
+        in.readStringList(directions);
+        in.readTypedList(ingredients, Ingredient.CREATOR);
+        in.readTypedList(photos, Uri.CREATOR);
+    }
 
-        public Builder setImages(ArrayList<Bitmap> images) {
-            this.images = images;
-            return this;
+    public static final Parcelable.Creator<Recipe> CREATOR = new Parcelable.Creator<Recipe>() {
+        public Recipe createFromParcel(Parcel in) {
+            return new Recipe(in);
         }
 
-        public Recipe build() {
-            return new Recipe(id, user, name, ingredients, directions, images);
+        public Recipe[] newArray(int size) {
+            return new Recipe[size];
         }
-    }
+    };
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/AddPantryItemActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/AddPantryItemActivity.java
deleted file mode 100644
index 127df5c..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/AddPantryItemActivity.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
- *
- * 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.
- */
-
-package com.cmput301.recipebot.ui;
-
-import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockActivity;
-
-/**
- * An activity that adds items to the Pantry.
- * TODO : Unimplemented.
- */
-public class AddPantryItemActivity extends RoboSherlockActivity {
-}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/AddRecipe.java b/app/src/main/java/com/cmput301/recipebot/ui/AddRecipe.java
deleted file mode 100644
index 3e53a54..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/AddRecipe.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package com.cmput301.recipebot.ui;
-
-
-//import android.R;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.BitmapFactory;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.MediaStore;
-import android.text.method.ScrollingMovementMethod;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.*;
-import com.cmput301.recipebot.R;
-
-//import com.actionbarsherlock.view.MenuItem;
-
-/*
- * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
- *
- * 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.
- */
-/**
- *     This class handles users creating a new recipe. It currently takes an uploaded user image
- *     and two edit texts for Instruction and Ingredients. The Save button would when implemented
- *     saved the Recipe for offline viewing. Users can share the recipe by uploading it online or
- *     publishing onto the database for online viewing/saving by other users.
- *
- *     ToDo:
- *     Horizontal Scroll On Images
- *     Multiple Images
- *     Waiting on DB for Publish/Save/Email
- *
- *     Save Title,Author, Date (Not sure how to implement this.. context menu on save?)
- *
- *
- *     Completed:
- *     User can publish photo to recipe
- *
- *     Attach Photo to Downloaded Recipe should use logic from previous.
- *
- *     Publish photo/recipe is stubbed and ready for database implementation
- *
- *     Save recipe is stubbed and also ready for cacheing
- *
- *     Share recipe needs menu button fixed.
- *
- *     Dialog for email appears, just need to implement a button for the send
- *
- *
- */
-public class AddRecipe extends Activity {
-
-
-    private static int RESULT_LOAD_IMAGE = 1;
-    private ShareActionProvider mShareActionProvider;
-
-    /** To be Implemented after **/
-//
-//    private int[] Images = new int[] { R.drawable.buttonimage};
-//
-//    // mainLayout is the child of the HorizontalScrollView
-//    private LinearLayout mainLayout;
-//
-//    // Array that holds our image button/future drawables
-//    private int[] images = {R.drawable.buttonimage, R.drawable.buttonimage,
-//            R.drawable.buttonimage, R.drawable.buttonimage, R.drawable.buttonimage, R.drawable.buttonimage, R.drawable.buttonimage};
-//
-//    private View cell;
-//    private TextView text;
-//
-//    private ViewPager viewPager;
-    //@InjectView(R.id.viewPager)
-   // ViewPager viewPager;
-
-//    @Override
-//    public void onBackPressed() {
-//
-//        if(viewPager != null && viewPager.isShown()){
-//
-//            viewPager.setVisibility(View.GONE);
-//        }
-//        else{
-//
-//            super.onBackPressed();
-//        }
-//    }
-
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.add_recipe);
-
-        /**Move here later**/
-        //Buttons
-        Button publishButton = (Button) findViewById(R.id.PublishButton);
-        Button saveButton = (Button) findViewById(R.id.SaveButton);
-
-
-        //requestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        /* Allows for Edit Texts to be Scrollable
-         *
-         * Get the string from these edit texts simply by
-         * IngredientEditText.toString();
-         * InstructionEditText.toString();
-         *
-         */
-        final EditText IngredientEditText = (EditText) findViewById(R.id.IngredientID);
-        IngredientEditText.setMovementMethod(new ScrollingMovementMethod());
-        final EditText InstructionEditText = (EditText) findViewById(R.id.InstructionID);
-        InstructionEditText.setMovementMethod(new ScrollingMovementMethod());
-
-        /*
-        This is the publish button's on click listener.
-        The data from this recipe should be uploaded to the database.
-
-        Until menu's share button works this button opens a context menu
-        that asks the user whether they wish to publish or share...
-        if we intend to keep this way we should change "Publish" to "Share"
-         */
-        publishButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //To change body of implemented methods use File | Settings | File Templates.
-                // Context menu example. Possibly use for save/share if needed
-                final CharSequence[] items = {"Publish","Email"};
-
-                AlertDialog.Builder builder = new AlertDialog.Builder(AddRecipe.this);
-                builder.setTitle("How would you like to share?");
-                builder.setItems(items, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int item) {
-                        Toast.makeText(getApplicationContext(),items[item], Toast.LENGTH_SHORT).show();
-
-                        System.out.println("ITEM IS: "+item);
-
-                        if(item == 1){
-                            AlertDialog.Builder ebuilder = new AlertDialog.Builder(AddRecipe.this);
-                            LayoutInflater inflater = getLayoutInflater();
-                            final View myView = inflater.inflate(R.layout.email_entry, null);
-                            ebuilder.setTitle("Who would you like to email?");
-                            ebuilder.setView(myView);
-                            AlertDialog alert = ebuilder.create();
-                            alert.show();
-
-
-                        }
-                    }
-
-                });
-                AlertDialog alert = builder.create();
-
-                alert.show();
-                    /*
-                    STUB
-                     */
-
-            }
-        });
-
-         /*
-        This is the Save button's on click listener.
-        The data from this recipe should be stored for the user to view if needed.
-         */
-        saveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //To change body of implemented methods use File | Settings | File Templates.
-                //onCreateContextMenu();
-
-                    /*
-                    STUB
-                     */
-
-            }
-        });
-
-   ImageButton imageButton = (ImageButton) findViewById(R.id.ImageButton);
-         /*
-        This is the Image button's on click listener.
-        A context menu should appear and ask what the user wishes to do with images.
-         */
-        imageButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                //To change body of implemented methods use File | Settings | File Templates.
-                Intent i = new Intent(
-                        Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
-
-                startActivityForResult(i, RESULT_LOAD_IMAGE);
-
-                    /*
-                    STUB
-                     */
-
-            }
-        });
-    }
-
-    /**
-     *  Allows for an image to be selected from the phone's Gallery
-     */
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data){
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if(requestCode == RESULT_LOAD_IMAGE && resultCode == RESULT_OK && null != data) {
-            Uri selectedImage = data.getData();
-
-            String[] filePathColumn = { MediaStore.Images.Media.DATA };
-
-            Cursor cursor = getContentResolver().query(selectedImage,filePathColumn, null,null,null);
-            cursor.moveToFirst();
-
-            int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
-            String picturePath = cursor.getString(columnIndex);
-            cursor.close();
-
-            ImageView myImage = (ImageView) findViewById(R.id.ImageButton);
-            myImage.setImageBitmap(BitmapFactory.decodeFile(picturePath));
-
-        }
-
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate menu resource file.
-        getMenuInflater().inflate(R.menu.recipe_share, menu);
-
-        // Locate MenuItem with ShareActionProvider
-        MenuItem item = menu.findItem(R.id.menu_item_share);
-
-        mShareActionProvider = (ShareActionProvider) item.getActionProvider();
-
-//        Intent myShareIntent = new Intent(Intent.ACTION_SEND);
-
-
-        mShareActionProvider.setShareIntent(getShareIntent());
-        this.setShareIntent(getShareIntent());
-
-        //Return true to display menu
-        return true;
-    }
-
-
-    //Call to update the share intent
-
-    private void setShareIntent (Intent shareIntent){
-        //if(mShareActionProvider != null){
-            mShareActionProvider.setShareIntent(shareIntent);
-        //}
-    }
-    // Gets the share intent
-    private Intent getShareIntent(){
-        Intent myShareIntent = new Intent();
-        myShareIntent.setAction(Intent.ACTION_SEND);
-        myShareIntent.setType("text/plain");
-        myShareIntent.putExtra(Intent.EXTRA_TEXT,"TEST");
-
-       // myShareIntent.setType("image/jpeg");
-        return myShareIntent;
-    }
-
-
-
-}
-
-
-/**
- //        viewPager = (ViewPager) findViewById(R.id.viewPager);
- //
- //        mainLayout = (LinearLayout) findViewById(R.id.linearLayout);
- //
- //            for (int i = 0; i < images.length; i++) {
- //
- //                cell = getLayoutInflater().inflate(R.layout.cell, null);
- //
- //                ImageView imageButton = (ImageView) cell.findViewById(R.id.buttonimage);
- //                imageButton.setOnClickListener(new View.OnClickListener() {
- //
- //                    @Override
- //                    public void onClick(View v) {
- //
- //                        viewPager.setVisibility(View.VISIBLE);
- //                        viewPager.setAdapter
- //                                (new RecipePagerAdapter(AddRecipe.this, images));
- //                        viewPager.setCurrentItem(v.getId());
- //
- //
- //                        // Allows for image upload from gallery
- //                         Intent i = new Intent(
- //                         Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
- //
- //                         startActivityForResult(i, RESULT_LOAD_IMAGE);
- //                    }
- //                });
- //
- //                imageButton.setId(i);
- //
- //                text = (TextView) cell.findViewById(R.id._imageName);
- //
- //                imageButton.setImageResource(images[i]);
- //                text.setText("Image#"+(i+1));
- //
- //                mainLayout.addView(cell);
- //     }
- */
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java
index ae0cfff..a601310 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/BaseActivity.java
@@ -1,20 +1,20 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.ui;
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
index ff4113b..fd8733b 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/MainActivity.java
@@ -1,111 +1,169 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.ui;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
 import com.actionbarsherlock.app.ActionBar;
+import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.ui.fragments.PantryFragment;
 import com.cmput301.recipebot.ui.fragments.SavedRecipesFragment;
 
+import java.util.ArrayList;
+
 /**
  * Main Activity, that shows two fragments {@link PantryFragment} and {@link SavedRecipesFragment}.
  */
 public class MainActivity extends BaseActivity {
 
+    ViewPager mViewPager;
+    TabsAdapter mTabsAdapter;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-        setupTabs();
+        setContentView(R.layout.activity_main);
+        mViewPager = (ViewPager) findViewById(R.id.pager);
+
+        setupTabs(savedInstanceState);
     }
 
     /**
      * Setup the tabs two display our fragments.
      */
-    private void setupTabs() {
+    private void setupTabs(Bundle savedInstanceState) {
         ActionBar actionBar = getSupportActionBar();
-        ActionBar.Tab tab = actionBar.newTab()
-                .setText(R.string.fragment_pantry_title)
-                .setTabListener(new TabListener<PantryFragment>(
-                        this, "pantry", PantryFragment.class));
-        actionBar.addTab(tab);
-
-        tab = actionBar.newTab()
-                .setText(R.string.fragment_saved_recipes_title)
-                .setTabListener(new TabListener<SavedRecipesFragment>(
-                        this, "saved recipes", SavedRecipesFragment.class));
-        actionBar.addTab(tab);
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+        actionBar.setDisplayOptions(0, ActionBar.DISPLAY_SHOW_TITLE);
+
+        mTabsAdapter = new TabsAdapter(this, mViewPager);
+        mTabsAdapter.addTab(actionBar.newTab().setText(R.string.fragment_pantry_title),
+                PantryFragment.class, null);
+        mTabsAdapter.addTab(actionBar.newTab().setText(R.string.fragment_saved_recipes_title),
+                SavedRecipesFragment.class, null);
+
+        if (savedInstanceState != null) {
+            actionBar.setSelectedNavigationItem(savedInstanceState.getInt("tab", 0));
+        }
+
     }
 
     /**
-     * Simply switches between our tabs.
-     * @param <T>
+     * This is a helper class that implements the management of tabs and all
+     * details of connecting a ViewPager with associated TabHost.  It relies on a
+     * trick.  Normally a tab host has a simple API for supplying a View or
+     * Intent that each tab will show.  This is not sufficient for switching
+     * between pages.  So instead we make the content part of the tab host
+     * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy
+     * view to show as the tab content.  It listens to changes in tabs, and takes
+     * care of switch to the correct paged in the ViewPager whenever the selected
+     * tab changes.
      */
-    public static class TabListener<T extends Fragment> implements ActionBar.TabListener {
-        private final FragmentActivity mActivity;
-        private final String mTag;
-        private final Class<T> mClass;
-        private Fragment mFragment;
-
-        /**
-         * Constructor used each time a new tab is created.
-         *
-         * @param activity The host Activity, used to instantiate the fragment
-         * @param tag      The identifier tag for the fragment
-         * @param clz      The fragment's Class, used to instantiate the fragment
-         */
-        public TabListener(FragmentActivity activity, String tag, Class<T> clz) {
-            mActivity = activity;
-            mTag = tag;
-            mClass = clz;
+    public static class TabsAdapter extends FragmentPagerAdapter
+            implements ActionBar.TabListener, ViewPager.OnPageChangeListener {
+        private final Context mContext;
+        private final ActionBar mActionBar;
+        private final ViewPager mViewPager;
+        private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
+
+        static final class TabInfo {
+            private final Class<?> clss;
+            private final Bundle args;
+
+            TabInfo(Class<?> _class, Bundle _args) {
+                clss = _class;
+                args = _args;
+            }
         }
 
-    /* The following are each of the ActionBar.TabListener callbacks */
+        public TabsAdapter(SherlockFragmentActivity activity, ViewPager pager) {
+            super(activity.getSupportFragmentManager());
+            mContext = activity;
+            mActionBar = activity.getSupportActionBar();
+            mViewPager = pager;
+            mViewPager.setAdapter(this);
+            mViewPager.setOnPageChangeListener(this);
+        }
 
+        public void addTab(ActionBar.Tab tab, Class<?> clss, Bundle args) {
+            TabInfo info = new TabInfo(clss, args);
+            tab.setTag(info);
+            tab.setTabListener(this);
+            mTabs.add(info);
+            mActionBar.addTab(tab);
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return mTabs.size();
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            TabInfo info = mTabs.get(position);
+            return Fragment.instantiate(mContext, info.clss.getName(), info.args);
+        }
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            mActionBar.setSelectedNavigationItem(position);
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+        }
+
+        @Override
         public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
-            // Check if the fragment is already initialized
-            if (mFragment == null) {
-                // If not, instantiate and add it to the activity
-                mFragment = Fragment.instantiate(mActivity, mClass.getName());
-                ft.add(android.R.id.content, mFragment, mTag);
-            } else {
-                // If it exists, simply attach it in order to show it
-                ft.attach(mFragment);
+            Object tag = tab.getTag();
+            for (int i = 0; i < mTabs.size(); i++) {
+                if (mTabs.get(i) == tag) {
+                    mViewPager.setCurrentItem(i);
+                }
             }
         }
 
+        @Override
         public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
-            if (mFragment != null) {
-                // Detach the fragment, because another one is being attached
-                ft.detach(mFragment);
-            }
         }
 
+        @Override
         public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
-            // User selected the already selected tab. Usually do nothing.
         }
     }
 
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt("tab", getSupportActionBar().getSelectedNavigationIndex());
+    }
+
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/PagerContainer.java b/app/src/main/java/com/cmput301/recipebot/ui/PagerContainer.java
deleted file mode 100644
index bb4a27e..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/PagerContainer.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package com.cmput301.recipebot.ui;
-
-/**
- * Sources:
- * https://gist.github.com/devunwired/8cbe094bb7a783e37ad1
- * http://commonsware.com/blog/2012/08/20/multiple-view-viewpager-options.html
- */
-
-/*
- * Copyright (c) 2012 Wireless Designs, LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * Might be needed for another kind of implementation of pager
- */
-import android.content.Context;
-import android.graphics.Point;
-import android.support.v4.view.ViewPager;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.widget.FrameLayout;
-/**
- * PagerContainer: A layout that displays a ViewPager with its children that are outside
- * the typical pager bounds.
- */
-public class PagerContainer extends FrameLayout implements ViewPager.OnPageChangeListener {
-
-    private ViewPager mPager;
-    boolean mNeedsRedraw = false;
-
-    public PagerContainer(Context context) {
-        super(context);
-        init();
-    }
-
-    public PagerContainer(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init();
-    }
-
-    public PagerContainer(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-        init();
-    }
-
-    private void init() {
-        //Disable clipping of children so non-selected pages are visible
-        setClipChildren(false);
-
-        //Child clipping doesn't work with hardware acceleration in Android 3.x/4.x
-        //You need to set this value here if using hardware acceleration in an
-        // application targeted at these releases.
-        setLayerType(View.LAYER_TYPE_SOFTWARE, null);
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        try {
-            mPager = (ViewPager) getChildAt(0);
-            mPager.setOnPageChangeListener(this);
-        } catch (Exception e) {
-            throw new IllegalStateException("The root child of PagerContainer must be a ViewPager");
-        }
-    }
-
-    public ViewPager getViewPager() {
-        return mPager;
-    }
-
-    private Point mCenter = new Point();
-    private Point mInitialTouch = new Point();
-
-    @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        mCenter.x = w / 2;
-        mCenter.y = h / 2;
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent ev) {
-        //We capture any touches not already handled by the ViewPager
-        // to implement scrolling from a touch outside the pager bounds.
-        switch (ev.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                mInitialTouch.x = (int)ev.getX();
-                mInitialTouch.y = (int)ev.getY();
-            default:
-                ev.offsetLocation(mCenter.x - mInitialTouch.x, mCenter.y - mInitialTouch.y);
-                break;
-        }
-
-        return mPager.dispatchTouchEvent(ev);
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-        //Force the container to redraw on scrolling.
-        //Without this the outer pages render initially and then stay static
-        if (mNeedsRedraw) invalidate();
-    }
-
-    @Override
-    public void onPageSelected(int position) { }
-
-    @Override
-    public void onPageScrollStateChanged(int state) {
-        mNeedsRedraw = (state != ViewPager.SCROLL_STATE_IDLE);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/RecipeActivity.java b/app/src/main/java/com/cmput301/recipebot/ui/RecipeActivity.java
new file mode 100644
index 0000000..5a76463
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/RecipeActivity.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
+package com.cmput301.recipebot.ui;
+
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.MediaStore;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ListView;
+import com.cmput301.recipebot.R;
+import com.cmput301.recipebot.model.Ingredient;
+import com.cmput301.recipebot.model.Recipe;
+import com.cmput301.recipebot.ui.adapters.TextViewListAdapter;
+import com.nostra13.universalimageloader.core.ImageLoader;
+import roboguice.inject.InjectExtra;
+import roboguice.inject.InjectView;
+
+import java.util.ArrayList;
+
+/**
+ * An Activity that allows user to add a recipe.
+ */
+public class RecipeActivity extends BaseActivity {
+
+    public static final String EXTRA_RECIPE = "EXTRA_RECIPE";
+    private static final int RESULT_LOAD_IMAGE = 458;
+
+    @InjectView(R.id.pager_recipe_images)
+    ViewPager mRecipePhotos;
+    @InjectView(R.id.list_directions)
+    ListView mListDirections;
+    @InjectView(R.id.list_ingredients)
+    ListView mListIngredient;
+
+    @InjectView(R.id.editText_recipe_title)
+    EditText mEditTextRecipeTitle;
+    @InjectView(R.id.editText_directions)
+    EditText mEditTextDirections;
+    @InjectView(R.id.button_add_direction)
+    ImageButton mButtonAddDirection;
+    @InjectView(R.id.editText_ingredients)
+    EditText mEditTextIngredients;
+    @InjectView(R.id.button_add_ingredient)
+    ImageButton mButtonAddIngredient;
+
+    @InjectExtra(EXTRA_RECIPE)
+    public Recipe mRecipe;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_recipe);
+        fillView();
+    }
+
+    private void fillView() {
+        mRecipePhotos.setAdapter(new ImagePagerAdapter(mRecipe.getPhotos()));
+        mListDirections.setAdapter(new TextViewListAdapter<String>(this, mRecipe.getDirections()));
+        mListIngredient.setAdapter(new TextViewListAdapter<Ingredient>(this, mRecipe.getIngredients()));
+        mEditTextRecipeTitle.setText(mRecipe.getUser());
+    }
+
+    private class ImagePagerAdapter extends PagerAdapter {
+
+        private ArrayList<Uri> images;
+        private LayoutInflater inflater;
+
+        ImagePagerAdapter(ArrayList<Uri> images) {
+            this.images = images;
+            this.inflater = getLayoutInflater();
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            ((ViewPager) container).removeView((View) object);
+        }
+
+        @Override
+        public int getCount() {
+            return images.size() + 1;
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup view, int position) {
+            final ImageView imageView = (ImageView) inflater.inflate(R.layout.pager_item_recipe_image, view, false);
+            if (position < images.size()) {
+                ImageLoader.getInstance().displayImage(images.get(position).toString(), imageView);
+            } else {
+                // Set up an add button
+                imageView.setImageResource(R.drawable.ic_action_add);
+                imageView.setOnClickListener(addImageListener);
+            }
+            ((ViewPager) view).addView(imageView, 0);
+            return imageView;
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view.equals(object);
+        }
+
+        private View.OnClickListener addImageListener = new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent i = new Intent(
+                        Intent.ACTION_PICK, MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+                startActivityForResult(i, RESULT_LOAD_IMAGE);
+            }
+        };
+
+        public void swapData(ArrayList<Uri> images) {
+            this.images = images;
+            notifyDataSetChanged();
+        }
+    }
+
+    /**
+     * Allows for an image to be selected from the phone's Gallery
+     */
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == RESULT_LOAD_IMAGE && resultCode == RESULT_OK && null != data) {
+            Uri selectedImage = data.getData();
+
+            String[] filePathColumn = {MediaStore.Images.Media.DATA};
+            Cursor cursor = getContentResolver().query(selectedImage, filePathColumn, null, null, null);
+            cursor.moveToFirst();
+            int columnIndex = cursor.getColumnIndex(filePathColumn[0]);
+            String picturePath = cursor.getString(columnIndex);
+            cursor.close();
+
+            Uri uri = Uri.parse("file:///" + picturePath);
+            mRecipe.addPhoto(uri);
+
+            ((ImagePagerAdapter) mRecipePhotos.getAdapter()).swapData(mRecipe.getPhotos());
+        }
+
+    }
+
+}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/RecipePagerAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/RecipePagerAdapter.java
deleted file mode 100644
index 6ccc386..0000000
--- a/app/src/main/java/com/cmput301/recipebot/ui/RecipePagerAdapter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.cmput301.recipebot.ui;
-
-import android.app.Activity;
-import android.os.Parcelable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.widget.ImageView;
-
-/**
- * Sources:
- * http://developer.android.com/reference/android/support/v4/view/PagerAdapter.html
- * http://stackoverflow.com/questions/6879137/imageview-and-pageradapter
- *
- * Recipe Pager Adapter holds our ViewPager and in the future should scroll our images.
- *
- */
-
-public class RecipePagerAdapter extends PagerAdapter {
-
-    private Activity activity;
-    private int[] drawableIDs;
-
-    public RecipePagerAdapter(Activity activity,int[] drawableIDs){
-
-        this.activity = activity;
-        this.drawableIDs = drawableIDs;
-    }
-
-    @Override
-    public int getCount() {
-        return drawableIDs.length;
-    }
-
-     /**
-     *
-     * Create the page for the given position. The adapter is responsible
-     * for adding the view to the container given here. Methods may need to
-     * be updated since a lot of methods are deprecated.. Need to update possibly
-     *
-     * param container The containing View in which the page will be shown.
-     * @param position The page position to be instantiated.
-     * @return Returns an Object representing the new page. This does not
-     * need to be a View, but can be some other container of the page.
-     */
-    @Override
-    public Object instantiateItem(View collection, int position) {
-
-        ImageView imageView = new ImageView(activity);
-
-        imageView.setBackgroundResource(drawableIDs[position]);
-
-        ((ViewPager) collection).addView(imageView,0);
-
-        return imageView;
-    }
-
-    /**
-     * Remove a page for the given position. The adapter is responsible
-     * for removing the view from its container, although it only must ensure
-     * this is done by the time it returns from finup
-     */
-    @Override
-    public void destroyItem(View collection, int position, Object view) {
-        ((ViewPager) collection).removeView((ImageView) view);
-    }
-
-    @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return view==((ImageView)object);
-    }
-
-    /**
-     * Called when the a change in the shown pages has been completed. At this
-     * point you must ensure that all of the pages have actually been added or
-     * removed from the container as appropriate.
-     * param container The containing View which is displaying this adapter's
-     * page views.
-     */
-    @Override
-    public void finishUpdate(View arg0) {}
-
-    @Override
-    public void restoreState(Parcelable arg0, ClassLoader arg1) {}
-
-    @Override
-    public Parcelable saveState() {
-        return null;
-    }
-
-    @Override
-    public void startUpdate(View arg0) {}
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
index 0e389db..e12f972 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/adapters/RecipeGridAdapter.java
@@ -20,12 +20,14 @@
 package com.cmput301.recipebot.ui.adapters;
 
 import android.content.Context;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.GridView;
 import android.widget.ImageView;
+import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.model.Recipe;
+import com.nostra13.universalimageloader.core.ImageLoader;
 
 import java.util.List;
 
@@ -36,6 +38,7 @@ public class RecipeGridAdapter extends BaseAdapter {
 
     /**
      * Construct the Adapter
+     *
      * @param context everything needs a context =(
      * @param recipes List of {@link Recipe} to display
      */
@@ -61,17 +64,16 @@ public long getItemId(int position) {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        // TODO: don;t use this in production code, do on a background thread
-        ImageView imageView;
+        final ImageView imageView;
         if (convertView == null) {
-            imageView = new ImageView(mContext);
-            imageView.setLayoutParams(new GridView.LayoutParams(300, 300));
-            imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
+            LayoutInflater layoutInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            imageView = (ImageView) layoutInflater.inflate(R.layout.item_recipe_image, parent, false);
         } else {
             imageView = (ImageView) convertView;
         }
 
-        imageView.setImageBitmap(mRecipes.get(position).getImages().get(0));
+        ImageLoader.getInstance().displayImage(mRecipes.get(position).getPhotos().get(0).toString(), imageView);
+
         return imageView;
     }
 }
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/adapters/TextViewListAdapter.java b/app/src/main/java/com/cmput301/recipebot/ui/adapters/TextViewListAdapter.java
new file mode 100644
index 0000000..6b935ff
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/adapters/TextViewListAdapter.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
+package com.cmput301.recipebot.ui.adapters;
+
+import android.R;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import java.util.List;
+
+/**
+ * A generic list adapter that displays T.toString in it's TextView
+ *
+ * @param <T>
+ */
+public class TextViewListAdapter<T> extends BaseAdapter {
+
+    List<T> data;
+    Context context;
+
+    public TextViewListAdapter(Context context, List<T> data) {
+        this.data = data;
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return data.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return data.get(0);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final TextView textView;
+        if (convertView == null) {
+            LayoutInflater layoutInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            textView = (TextView) layoutInflater.inflate(R.layout.simple_list_item_1, null);
+        } else {
+            textView = (TextView) convertView;
+        }
+
+        textView.setText(data.get(position).toString());
+
+        return textView;
+    }
+
+    public void swapData(List<T> data) {
+        this.data = data;
+        notifyDataSetChanged();
+    }
+}
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
index ed7b06d..32ca4a4 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java
@@ -1,38 +1,49 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.ui.fragments;
 
-import android.content.Intent;
+import android.content.Context;
 import android.os.Bundle;
-import android.widget.ArrayAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.CheckBox;
+import android.widget.EditText;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
-import com.cmput301.recipebot.ui.AddPantryItemActivity;
+import com.cmput301.recipebot.model.Ingredient;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockListFragment;
 
+import java.util.ArrayList;
+
 /**
- * A fragment that shows a list of items in the pantry - {@link com.cmput301.recipebot.model.PantryItem}
+ * A fragment that shows a list of items in the pantry.
  */
-public class PantryFragment extends RoboSherlockListFragment {
+public class PantryFragment extends RoboSherlockListFragment implements View.OnClickListener {
+
+    private EditText mEdiText;
+    ArrayList<Ingredient> mItems;
+    PantryListAdapter mAdapter;
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -46,18 +57,21 @@ public void onActivityCreated(Bundle savedInstanceState) {
     private void fillView() {
         setListShown(false);
 
-        // TODO : fill with stuff
         setEmptyText(getSherlockActivity().getResources().getString(R.string.no_pantry_items));
 
-        String[] values = new String[]{"Android", "iPhone", "WindowsMobile",
-                "Blackberry", "WebOS", "Ubuntu", "Windows7", "Max OS X",
-                "Linux", "OS/2"};
+        LayoutInflater layoutInflater = getSherlockActivity().getLayoutInflater();
 
-        ArrayAdapter<String> adapter = new ArrayAdapter<String>(getSherlockActivity(),
-                android.R.layout.simple_list_item_1, android.R.id.text1, values);
+        View header = layoutInflater.inflate(R.layout.fragment_pantry_header, null);
+        header.findViewById(R.id.button_add_pantry).setOnClickListener(this);
+        mEdiText = (EditText) header.findViewById(R.id.editText_pantry);
+        getListView().addHeaderView(header);
 
-        setListAdapter(adapter);
+        mItems = new ArrayList<Ingredient>();
+        mItems.add(new Ingredient("Eggs", "nos.", 2f));
+        mItems.add(new Ingredient("Milk", "ml", 500f));
 
+        mAdapter = new PantryListAdapter();
+        setListAdapter(mAdapter);
         setListShown(true);
 
     }
@@ -71,19 +85,66 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_add_pantry:
-                addPantryItem();
+                addEntry();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
         }
     }
 
-    /**
-     * Start an activity to add a new PantryItem
-     */
-    private void addPantryItem() {
-        Intent i = new Intent(getSherlockActivity(), AddPantryItemActivity.class);
-        startActivity(i);
+    private void addEntry() {
+        Ingredient item = new Ingredient();
+        item.setName(mEdiText.getText().toString());
+        mItems.add(item);
+        mAdapter.swapData(mItems);
+    }
+
+    @Override
+    public void onClick(View v) {
+        switch (v.getId()) {
+            case R.id.button_add_pantry:
+                addEntry();
+        }
+    }
+
+    public class PantryListAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return mItems.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mItems.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final View view;
+            if (convertView == null) {
+                LayoutInflater layoutInflater = (LayoutInflater) getSherlockActivity().
+                        getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+                view = layoutInflater.inflate(R.layout.item_pantry, parent, false);
+            } else {
+                view = (convertView);
+            }
+
+            CheckBox box = (CheckBox) view.findViewById(R.id.checkBox);
+            box.setText(((Ingredient) getItem(position)).getName());
+
+            return view;
+        }
+
+        public void swapData(ArrayList<Ingredient> items) {
+            mItems = items;
+            notifyDataSetChanged();
+        }
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
index 6eb39ff..fee8a20 100644
--- a/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
+++ b/app/src/main/java/com/cmput301/recipebot/ui/fragments/SavedRecipesFragment.java
@@ -1,27 +1,26 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.ui.fragments;
 
 import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -33,18 +32,22 @@
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.cmput301.recipebot.R;
+import com.cmput301.recipebot.model.Ingredient;
 import com.cmput301.recipebot.model.Recipe;
-import com.cmput301.recipebot.ui.AddRecipe;
+import com.cmput301.recipebot.ui.RecipeActivity;
 import com.cmput301.recipebot.ui.adapters.RecipeGridAdapter;
 import com.github.rtyley.android.sherlock.roboguice.fragment.RoboSherlockFragment;
 
 import java.util.ArrayList;
+import java.util.UUID;
 
 /**
  * A simple fragment that shows a list of {@link Recipe} items.
  */
 public class SavedRecipesFragment extends RoboSherlockFragment implements AdapterView.OnItemClickListener {
 
+    private static final String LOGTAG = "SavedRecipesFragment";
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
@@ -84,31 +87,69 @@ public boolean onOptionsItemSelected(MenuItem item) {
      * Start an activity to add a new Recipe
      */
     private void addRecipe() {
-        Intent i = new Intent(getActivity(), AddRecipe.class);
-        startActivity(i);
+        Recipe recipe = new Recipe();
+        recipe.setId(UUID.randomUUID().toString());
+        recipe.setName("Shake and Bake Chicken");
+        recipe.setUser("Colonel Sanders");
+        ArrayList<String> directions = new ArrayList<String>();
+        directions.add("1. First Shake");
+        directions.add("2. Then Bake");
+        recipe.setDirections(directions);
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("Chicken", "g", 500f));
+        ingredients.add(new Ingredient("Shake and Bake mix", "packet", 1f));
+        ingredients.add(new Ingredient("Tequila", "bottle", 1f));
+        recipe.setIngredients(ingredients);
+        ArrayList<Uri> photos = new ArrayList<Uri>();
+        photos.add(Uri.parse("http://www.kraftrecipes.com/assets/recipe_images/SHAKE_N_BAKE_Honey_Drummies.jpg"));
+        photos.add(Uri.parse("http://images.media-allrecipes.com/userphotos/250x250/00/68/33/683349.jpg"));
+        recipe.setPhotos(photos);
+        Intent intent = new Intent(getSherlockActivity(), RecipeActivity.class);
+        intent.putExtra(RecipeActivity.EXTRA_RECIPE, recipe);
+        startActivity(intent);
     }
 
-
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         Toast.makeText(getSherlockActivity(), "clicked recipe # " + position, Toast.LENGTH_SHORT).show();
     }
 
-    private ArrayList<Recipe> getTestRecipes() {
+    private static ArrayList<Recipe> getTestRecipes() {
 
-        // TODO : this is just a test, should also do on a background thread, check for recycled views etc.
-        int[] bitmapIDs = {R.drawable.test_recipe_image_1, R.drawable.test_recipe_image_2,
-                R.drawable.test_recipe_image_3, R.drawable.test_recipe_image_4, R.drawable.test_recipe_image_5,
-                R.drawable.test_recipe_image_6};
+        final String[] IMAGES = new String[]{
+                "https://lh6.googleusercontent.com/-jZgveEqb6pg/T3R4kXScycI/AAAAAAAAAE0/xQ7CvpfXDzc/s1024/sample_image_01.jpg",
+                "https://lh4.googleusercontent.com/-K2FMuOozxU0/T3R4lRAiBTI/AAAAAAAAAE8/a3Eh9JvnnzI/s1024/sample_image_02.jpg",
+                "https://lh5.googleusercontent.com/-SCS5C646rxM/T3R4l7QB6xI/AAAAAAAAAFE/xLcuVv3CUyA/s1024/sample_image_03.jpg",
+                "https://lh6.googleusercontent.com/-f0NJR6-_Thg/T3R4mNex2wI/AAAAAAAAAFI/45oug4VE8MI/s1024/sample_image_04.jpg",
+                "https://lh3.googleusercontent.com/-n-xcJmiI0pg/T3R4mkSchHI/AAAAAAAAAFU/EoiNNb7kk3A/s1024/sample_image_05.jpg",
+                "https://lh3.googleusercontent.com/-X43vAudm7f4/T3R4nGSChJI/AAAAAAAAAFk/3bna6D-2EE8/s1024/sample_image_06.jpg",
+                "https://lh5.googleusercontent.com/-MpZneqIyjXU/T3R4nuGO1aI/AAAAAAAAAFg/r09OPjLx1ZY/s1024/sample_image_07.jpg",
+                "https://lh6.googleusercontent.com/-ql3YNfdClJo/T3XvW9apmFI/AAAAAAAAAL4/_6HFDzbahc4/s1024/sample_image_08.jpg",
+                "https://lh5.googleusercontent.com/-Pxa7eqF4cyc/T3R4oasvPEI/AAAAAAAAAF0/-uYDH92h8LA/s1024/sample_image_09.jpg",
+                "https://lh4.googleusercontent.com/-Li-rjhFEuaI/T3R4o-VUl4I/AAAAAAAAAF8/5E5XdMnP1oE/s1024/sample_image_10.jpg",
+                "https://lh5.googleusercontent.com/-_HU4fImgFhA/T3R4pPVIwWI/AAAAAAAAAGA/0RfK_Vkgth4/s1024/sample_image_11.jpg",
+                "https://lh6.googleusercontent.com/-0gnNrVjwa0Y/T3R4peGYJwI/AAAAAAAAAGU/uX_9wvRPM9I/s1024/sample_image_12.jpg",
+                "https://lh3.googleusercontent.com/-HBxuzALS_Zs/T3R4qERykaI/AAAAAAAAAGQ/_qQ16FaZ1q0/s1024/sample_image_13.jpg",
+                "https://lh4.googleusercontent.com/-cKojDrARNjQ/T3R4qfWSGPI/AAAAAAAAAGY/MR5dnbNaPyY/s1024/sample_image_14.jpg",
+                "https://lh3.googleusercontent.com/-WujkdYfcyZ8/T3R4qrIMGUI/AAAAAAAAAGk/277LIdgvnjg/s1024/sample_image_15.jpg",
+                "https://lh6.googleusercontent.com/-FMHR7Vy3PgI/T3R4rOXlEKI/AAAAAAAAAGs/VeXrDNDBkaw/s1024/sample_image_16.jpg",
+                "https://lh4.googleusercontent.com/-mrR0AJyNTH0/T3R4rZs6CuI/AAAAAAAAAG0/UE1wQqCOqLA/s1024/sample_image_17.jpg",
+                "https://lh6.googleusercontent.com/-z77w0eh3cow/T3R4rnLn05I/AAAAAAAAAG4/BaerfWoNucU/s1024/sample_image_18.jpg",
+                "https://lh5.googleusercontent.com/-aWVwh1OU5Bk/T3R4sAWw0yI/AAAAAAAAAHE/4_KAvJttFwA/s1024/sample_image_19.jpg",
+                "https://lh6.googleusercontent.com/-q-js52DMnWQ/T3R4tZhY2sI/AAAAAAAAAHM/A8kjp2Ivdqg/s1024/sample_image_20.jpg",
+                "https://lh5.googleusercontent.com/-_jIzvvzXKn4/T3R4t7xpdVI/AAAAAAAAAHU/7QC6eZ10jgs/s1024/sample_image_21.jpg",
+                "https://lh3.googleusercontent.com/-lnGi4IMLpwU/T3R4uCMa7vI/AAAAAAAAAHc/1zgzzz6qTpk/s1024/sample_image_22.jpg",
+        };
 
         ArrayList<Recipe> recipes = new ArrayList<Recipe>();
-        for (int i = 0; i < 15; i++) {
-            Bitmap test = BitmapFactory.decodeResource(getSherlockActivity().getResources(),
-                    bitmapIDs[i % bitmapIDs.length]);
-            ArrayList<Bitmap> bitmaps = new ArrayList<Bitmap>();
-            bitmaps.add(test);
-            Recipe r = new Recipe.Builder().setDirections(null).setId(0).setIngredients(null).setName("hi").
-                    setUser("bob").setImages(bitmaps).build();
+        for (int i = 0; i < 150; i++) {
+            ArrayList<Uri> photos = new ArrayList<Uri>();
+            photos.add(Uri.parse(IMAGES[i % IMAGES.length]));
+            Recipe r = new Recipe();
+            r.setId(UUID.randomUUID().toString());
+            r.setName("hi");
+            r.setUser("bob");
+            r.setPhotos(photos);
             recipes.add(r);
         }
 
diff --git a/app/src/main/java/com/cmput301/recipebot/ui/views/VerticalScrollView.java b/app/src/main/java/com/cmput301/recipebot/ui/views/VerticalScrollView.java
new file mode 100644
index 0000000..78b7f74
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/ui/views/VerticalScrollView.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
+package com.cmput301.recipebot.ui.views;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.widget.ScrollView;
+
+/**
+ * http://stackoverflow.com/questions/6210895/listview-inside-scrollview-is-not-scrolling-on-android
+ */
+public class VerticalScrollView extends ScrollView {
+
+    public VerticalScrollView(Context context) {
+        super(context);
+    }
+
+    public VerticalScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public VerticalScrollView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        final int action = ev.getAction();
+        switch (action) {
+            case MotionEvent.ACTION_DOWN:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: DOWN super false");
+                super.onTouchEvent(ev);
+                break;
+
+            case MotionEvent.ACTION_MOVE:
+                return false; // redirect MotionEvents to ourself
+
+            case MotionEvent.ACTION_CANCEL:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: CANCEL super false");
+                super.onTouchEvent(ev);
+                break;
+
+            case MotionEvent.ACTION_UP:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: UP super false");
+                return false;
+
+            default:
+                Log.i("VerticalScrollview", "onInterceptTouchEvent: " + action);
+                break;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent ev) {
+        super.onTouchEvent(ev);
+        Log.i("VerticalScrollview", "onTouchEvent. action: " + ev.getAction());
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/cmput301/recipebot/util/LogUtils.java b/app/src/main/java/com/cmput301/recipebot/util/LogUtils.java
new file mode 100644
index 0000000..3a8a384
--- /dev/null
+++ b/app/src/main/java/com/cmput301/recipebot/util/LogUtils.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012 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.
+ */
+
+package com.cmput301.recipebot.util;
+
+/**
+ * Helper methods that make logging more consistent throughout the app.
+ */
+public class LogUtils {
+    private static final String LOG_PREFIX = "rbot_";
+    private static final int LOG_PREFIX_LENGTH = LOG_PREFIX.length();
+    private static final int MAX_LOG_TAG_LENGTH = 23;
+
+    public static String makeLogTag(String str) {
+        if (str.length() > MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH) {
+            return LOG_PREFIX + str.substring(0, MAX_LOG_TAG_LENGTH - LOG_PREFIX_LENGTH - 1);
+        }
+
+        return LOG_PREFIX + str;
+    }
+
+    /**
+     * WARNING: Don't use this when obfuscating class names with Proguard!
+     */
+    public static String makeLogTag(Class cls) {
+        return makeLogTag(cls.getSimpleName());
+    }
+}
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
index 152e4c4..98ad895 100644
--- a/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/ClientTest.java
@@ -1,57 +1,325 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
 package com.cmput301.recipebot.core.core;
 
 import com.cmput301.recipebot.client.ESClient;
 import com.cmput301.recipebot.model.Ingredient;
 import com.cmput301.recipebot.model.Recipe;
+import org.junit.Before;
 import org.junit.Test;
 
-import java.util.ArrayList;
+import java.util.*;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static com.cmput301.recipebot.core.core.RecipeAssert.assertThat;
+import static org.fest.assertions.api.Assertions.assertThat;
 
 /**
  * Unit tests of client API
  */
 public class ClientTest {
 
+    private static final String[] RECIPE_NAMES = {"Chicken Parmesan", "Kentucky Fried Chicken", "Green Salad", "Kahlua",
+            "Stir Fry", "Fried Rice", "Hamburger", "Mocha", "Cream Soda", "Omelette's", "Chicken Wings", "Caesar Salad",
+            "Steak", "Chilli", "Baked Rice", "Roasted Potatoes", "Chicken Satay", "Ravioli", "Corn on the Cob"};
+    private static final String[] RECIPE_DESCRIPTIONS = {"Very Healthy", "Not so healthy!", "Unhealthy"};
+    private static final String[] RECIPE_INGREDIENTS = {"Chicken", "Butter", "Water", "Fresh Vegetables",
+            "Fresh Greens", "Vodka", "Oil", "Bun", "Salt", "Lamb", "Peas", "Fish", "Beans", "Tofu", "Cream",
+            "Sugar", "Rhubarb", "Milk", "Eggs", "Strawberry", "Honey Garlic", "Corn", "Beans", "Kale", "Bacon"};
+    private static final String[] RECIPE_DIRECTIONS = {"Bake", "Mix", "Shake", "Blend", "Eat", "Heat",
+            "Fry", "Saute", "Mash", "Steam", "Stir", "Whip", "Chop", "Blend", "Boil", "Grill"};
+    private static final String[] RECIPE_USERS = {"Prateek", "Adam", "Ethan", "Brian", "Batman", "Superman",
+            "Spiderman", "Green Lantern", "Bruce", "Clark"};
+    private static final int TEST_SIZES = 50;
+
+    private ESClient mClient;
+    private Comparator<Recipe> recipeComparator;
+
+    @Before
+    public void setUp() throws Exception {
+        mClient = new ESClient();
+        // insertRecipesToServer();
+        recipeComparator = new RecipeComparator();
+    }
+
     /**
-     * Test that a {@link Recipe} object can be created.
+     * Test that a {@link Recipe} object can be inserted.
+     * It also retrieves the object for testing.
+     *
      * @throws Exception
      */
     @Test
     public void testInsert() throws Exception {
-        Recipe.Builder builder = new Recipe.Builder();
-        builder.setId(999);
-        builder.setUser("Emily");
-        builder.setName("Cheese Cake");
-        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
-        ingredients.add(new Ingredient("egg", "nos", 2f));
-        ingredients.add(new Ingredient("cheese", "slices", 2f));
-        ingredients.add(new Ingredient("milk", "ml", 500f));
-        builder.setIngredients(ingredients);
-        ArrayList<String> directions = new ArrayList<String>();
-        directions.add("mix and bake");
-        builder.setDirections(directions);
-        builder.setImages(null);
-        Recipe recipe = builder.build();
-        boolean response = ESClient.insertRecipe(recipe);
+        Recipe r = getTestRecipe();
+        boolean response = mClient.insertRecipe(r);
+        assertThat(response).isTrue();
+        Recipe actual = mClient.getRecipe(r.getId());
+        assertThat(r).usingComparator(recipeComparator).isEqualTo(actual);
+    }
+
+    /**
+     * Test that a {@link Recipe} object can be updated.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testUpdate() throws Exception {
+        // Test the inital conditions. The user is randomised between runs.
+        Recipe recipe = mClient.getRecipe("ab3fa2b0-7c52-43b3-9e27-76a7b8959751");
+        assertThat(recipe).hasName("Stir Fry").hasDirection("Boil").hasDirection("Bake")
+                .hasIngredient(new Ingredient("Peas", "testing", 2f)).hasDescription("Not so healthy!");
+
+        // make a new_user that is not the same as the old one.
+        String original_user = recipe.getUser();
+        String new_user = new String(original_user);
+        while (new_user.compareToIgnoreCase(original_user) == 0) {
+            new_user = RECIPE_USERS[new Random().nextInt(RECIPE_USERS.length)];
+        }
 
-        assertTrue(response);
+        // Change some attribute
+        recipe.setUser(new_user);
+        assertThat(recipe).hasUser(new_user);
+        boolean response = mClient.updateRecipe(recipe);
+        assertThat(response).isTrue();
 
-        Recipe recipe2 = ESClient.getRecipe(999);
-        assertEquals("Emily", recipe2.getUser());
-        assertEquals("Cheese Cake", recipe2.getName());
+        //Verify only that attribute has changed in server, other remain same
+        Recipe recipe2 = mClient.getRecipe("ab3fa2b0-7c52-43b3-9e27-76a7b8959751");
+        assertThat(recipe2).hasName("Stir Fry").hasUser(new_user).hasDirection("Boil").hasDirection("Bake")
+                .hasIngredient(new Ingredient("Peas", "testing", 2f)).hasDescription("Not so healthy!");
     }
 
     /**
      * Test that a {@link Recipe} object can be retrieved.
+     *
      * @throws Exception
      */
     @Test
     public void testRetrieval() throws Exception {
-        Recipe recipe = ESClient.getRecipe(999);
-        assertEquals("Emily", recipe.getUser());
-        assertEquals("Cheese Cake", recipe.getName());
+        Recipe recipe1 = mClient.getRecipe("63ed5a87-3402-4148-8602-10cc8ff63fa7");
+        assertThat(recipe1).hasName("Stir Fry").hasUser("Spiderman").hasDirection("Stir")
+                .hasIngredient(new Ingredient("Lamb", "testing", 2f)).hasDescription("Not so healthy!");
+
+        Recipe recipe2 = mClient.getRecipe("1d859b92-c1e3-4b48-9c23-f5472937403d");
+        assertThat(recipe2).hasName("Omlette").hasUser("Bruce").hasDirection("Whip")
+                .hasIngredient(new Ingredient("Milk", "dsa", 2f))
+                .hasIngredient(new Ingredient("Oil", "sdsa", 2f)).hasDescription("Very Healthy");
+    }
+
+    /**
+     * Test that a {@link Recipe} object can be inserted.
+     * It also retrieves the object for testing.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testDelete() throws Exception {
+        Recipe r = getTestRecipe();
+        boolean response = mClient.insertRecipe(r);
+        assertThat(response).isTrue();
+        boolean deleteResponse = mClient.deleteRecipe(r.getId());
+        assertThat(deleteResponse).isTrue();
+        Recipe recipe1 = mClient.getRecipe(r.getId());
+        assertThat(recipe1).isNull();
+    }
+
+    /**
+     * Test that a {@link Recipe} can be searched by its name.
+     * TODO : add a unique recipe (that will return only one).
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByName() throws Exception {
+        // Test the initial conditions, verify that the recipe exists on the server.
+        Recipe recipe = mClient.getRecipe("ac864659-9f55-480c-b744-8dbf0c180911");
+        assertThat(recipe).hasName("Cream Soda").hasUser("Batman").hasDirection("Mix").hasDirection("Grill")
+                .hasIngredient(new Ingredient("Butter", "testing", 2f)).hasDescription("Very Healthy");
+
+        List<Recipe> recipes = mClient.searchRecipes("Cream Soda");
+        assertThat(recipes.size()).isGreaterThan(0); // We know this exists, but could be multiple (random).
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe); // confirm that it contains our expected recipe
+
+        recipes = mClient.searchRecipes("dsadssadasdas");
+        assertThat(recipes.size()).isEqualTo(0); // We know this doesn't exist.
+    }
+
+    /**
+     * Test that a {@link Recipe} can be searched by any one of its ingredients.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByIndividualIngredient() throws Exception {
+        Recipe recipe = mClient.getRecipe("3df532d5-f141-493b-9cec-dab02d2b3210");
+
+        // Search with the every ingredient individually.
+        for (Ingredient i : recipe.getIngredients()) {
+            ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+            ingredients.add(i);
+            List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
+            assertThat(recipes.size()).isGreaterThan(0); // We know this exists, but could be multiple (random).
+            assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe);
+        }
+
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("dsadsadasdasdasdada", "lb", 2f));
+        List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
+        assertThat(recipes.size()).isEqualTo(0); // We know this doesn't exist.
+    }
+
+    /**
+     * Test that mulitple {@link Recipe} is given by a search.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByIngredientsReturnsMultipleRecipes() throws Exception {
+        Recipe recipe1 = mClient.getRecipe("3df532d5-f141-493b-9cec-dab02d2b3210");
+        Recipe recipe2 = mClient.getRecipe("e5bb4189-5e5b-4659-9030-ec99983b69b5");
+        Ingredient ingredient = new Ingredient("Bacon", "testing", 2f);
+        assertThat(recipe1).hasIngredient(ingredient);
+        assertThat(recipe2).hasIngredient(ingredient);
+
+        List<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(ingredient);
+        List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
+        assertThat(recipes.size()).isGreaterThan(1); // We know at least two exist.
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe1);
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe2);
+    }
+
+    /**
+     * Test that mulitple {@link Recipe} is given by a search.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchByMultipleIngredients() throws Exception {
+        Recipe recipe = mClient.getRecipe("268d295f-2829-4d8c-b0fa-d3ffedad03e7");
+        Ingredient vodka = new Ingredient("Vodka", "testing", 2f);
+        Ingredient butter = new Ingredient("Butter", "testing", 2f);
+        Ingredient peas = new Ingredient("Peas", "testing", 2f);
+        Ingredient fish = new Ingredient("Fish", "testing", 2f);
+        assertThat(recipe).hasIngredient(vodka).hasIngredient(butter).hasIngredient(peas).hasIngredient(fish);
+
+        List<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(vodka);
+        ingredients.add(butter);
+        ingredients.add(peas);
+        ingredients.add(fish);
+
+        // Test that we get at least this one (many recipes with one or more of these ingredients.
+        List<Recipe> recipes = mClient.searchRecipes(ingredients, false);
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe);
+
+        // Test that we get only this one (only recipe with all ingredients)
+        recipes = mClient.searchRecipes(ingredients, true);
+        assertThat(recipes).usingElementComparator(recipeComparator).contains(recipe).hasSize(1);
+    }
+
+    /**
+     * Make a new Recipe
+     *
+     * @return A test recipe.
+     */
+    private Recipe getTestRecipe() {
+        Recipe recipe = new Recipe();
+        recipe.setId("testing_id");
+        recipe.setUser("Colonel Sanders");
+        recipe.setName("Kentucky Fried Chicken");
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("Chicken", "lb", 2f));
+        ingredients.add(new Ingredient("Secret Spice #1", "tbsp.", 1f));
+        ingredients.add(new Ingredient("Secret Spice #2", "tsp.", 1f));
+        ingredients.add(new Ingredient("Buttermilk", "ml", 50f));
+        recipe.setIngredients(ingredients);
+        ArrayList<String> directions = new ArrayList<String>();
+        directions.add("1. Mix");
+        directions.add("2. Bake");
+        directions.add("3. Eat");
+        recipe.setDirections(directions);
+        recipe.setPhotos(null);
+        return recipe;
+    }
+
+    /**
+     * A method that generates a dataset that can be pushed to the server.
+     * Our tests are reliant on this dataset. Everytime this function is used to generate a new dataset,
+     * update our expected values.
+     */
+    private void insertRecipesToServer() {
+        List<Recipe> mRecipeList;
+
+        mRecipeList = generateTestRecipes();
+
+        for (Recipe recipe : mRecipeList) {
+            mClient.insertRecipe(recipe);
+        }
+    }
+
+    /**
+     * Generate some random recipes.
+     */
+    private List<Recipe> generateTestRecipes() {
+        List<Recipe> recipeList = new ArrayList<Recipe>();
+
+        Random random = new Random();
+
+        for (int i = 0; i < TEST_SIZES; i++) {
+            Recipe r = new Recipe();
+            r.setId(UUID.randomUUID().toString());
+            r.setDescription(RECIPE_DESCRIPTIONS[random.nextInt(RECIPE_DESCRIPTIONS.length)]);
+            r.setUser(RECIPE_USERS[random.nextInt(RECIPE_USERS.length)]);
+            r.setName(RECIPE_NAMES[random.nextInt(RECIPE_NAMES.length)]);
+            ArrayList<String> directions = new ArrayList<String>();
+            for (int j = 0; j < random.nextInt(3) + 1; j++) {
+                directions.add(RECIPE_DIRECTIONS[random.nextInt(RECIPE_DIRECTIONS.length)]);
+            }
+            r.setDirections(directions);
+            ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+            for (int j = 0; j < random.nextInt(6) + 1; j++) {
+                String name = RECIPE_INGREDIENTS[random.nextInt(RECIPE_INGREDIENTS.length)];
+                Ingredient ingredient = new Ingredient(name, "testing", 4f);
+                ingredients.add(ingredient);
+            }
+            r.setIngredients(ingredients);
+            r.setPhotos(null);
+            recipeList.add(r);
+        }
+
+        return recipeList;
+    }
+
+    private class RecipeComparator implements Comparator<Recipe> {
+
+        @Override
+        public int compare(Recipe lhs, Recipe rhs) {
+            if (lhs.getId().compareToIgnoreCase(rhs.getId()) != 0) {
+                return 1;
+            }
+            if (lhs.getUser().compareToIgnoreCase(rhs.getUser()) != 0) {
+                return 1;
+            }
+            if (lhs.getName().compareToIgnoreCase(rhs.getName()) != 0) {
+                return 1;
+            }
+            return 0;
+        }
     }
 }
diff --git a/app/src/test/java/com/cmput301/recipebot/core/core/RecipeAssert.java b/app/src/test/java/com/cmput301/recipebot/core/core/RecipeAssert.java
new file mode 100644
index 0000000..1e3c33f
--- /dev/null
+++ b/app/src/test/java/com/cmput301/recipebot/core/core/RecipeAssert.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
+package com.cmput301.recipebot.core.core;
+
+import com.cmput301.recipebot.model.Ingredient;
+import com.cmput301.recipebot.model.Recipe;
+import org.fest.assertions.api.AbstractAssert;
+import org.fest.assertions.api.Assertions;
+
+import java.util.Comparator;
+
+public class RecipeAssert extends AbstractAssert<RecipeAssert, Recipe> {
+
+    public RecipeAssert(Recipe actual) {
+        super(actual, RecipeAssert.class);
+    }
+
+    public static RecipeAssert assertThat(Recipe actual) {
+        return new RecipeAssert(actual);
+    }
+
+    public RecipeAssert hasId(String id) {
+        isNotNull();
+        Assertions.assertThat(actual.getId())
+                .overridingErrorMessage("Expected recipe's id to be <%s> but was <%s>", id, actual.getId())
+                .isEqualTo(id);
+        return this;
+    }
+
+    public RecipeAssert hasDescription(String description) {
+        isNotNull();
+        Assertions.assertThat(actual.getDescription())
+                .overridingErrorMessage("Expected recipe's description to be <%s> but was <%s>", description, actual.getDescription())
+                .isEqualTo(description);
+        return this;
+    }
+
+    public RecipeAssert hasUser(String user) {
+        isNotNull();
+        Assertions.assertThat(actual.getUser())
+                .overridingErrorMessage("Expected recipe's user to be <%s> but was <%s>", user, actual.getUser())
+                .isEqualTo(user);
+        return this;
+    }
+
+    public RecipeAssert hasName(String name) {
+        isNotNull();
+        Assertions.assertThat(actual.getName())
+                .overridingErrorMessage("Expected recipe's name to be <%s> but was <%s>", name, actual.getName())
+                .isEqualTo(name);
+        return this;
+    }
+
+    public RecipeAssert hasDirection(String direction) {
+        isNotNull();
+        Assertions.assertThat(actual.getDirections())
+                .overridingErrorMessage("Expected recipe's directions to have <%s> but had <%s>", direction, actual.getDirections())
+                .contains(direction);
+        return this;
+    }
+
+    public RecipeAssert hasIngredient(Ingredient ingredient) {
+        isNotNull();
+        Assertions.assertThat(actual.getIngredients())
+                .overridingErrorMessage("Expected recipe's ingredients to have <%s> but had <%s>", ingredient, actual.getIngredients())
+                .usingElementComparator(new IngredientComparator()).contains(ingredient);
+        return this;
+    }
+
+    private class IngredientComparator implements Comparator<Ingredient> {
+
+        @Override
+        public int compare(Ingredient lhs, Ingredient rhs) {
+            if (lhs.getName().compareToIgnoreCase(rhs.getName()) != 0) {
+                return 1;
+            }
+            return 0;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/integration-tests/AndroidManifest.xml b/integration-tests/AndroidManifest.xml
index c627c50..b816e3b 100755
--- a/integration-tests/AndroidManifest.xml
+++ b/integration-tests/AndroidManifest.xml
@@ -7,6 +7,7 @@
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner"/>
+
     </application>
 
     <instrumentation android:label="RecipeBot - Integration Tests" android:name="android.test.InstrumentationTestRunner"
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/ActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/ActivityTest.java
new file mode 100644
index 0000000..ef4c4fb
--- /dev/null
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/ActivityTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
+package com.cmput301.recipebot.test;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.test.ActivityInstrumentationTestCase2;
+
+public abstract class ActivityTest<T extends Activity> extends ActivityInstrumentationTestCase2<T> {
+
+    protected Instrumentation instrumentation;
+    protected T activity;
+
+    public ActivityTest(Class<T> activityClass) {
+        super(activityClass);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        instrumentation = getInstrumentation();
+        activity = getActivity();
+    }
+}
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
index 14682d3..afb0a02 100755
--- a/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/MainActivityTest.java
@@ -1,27 +1,26 @@
 /*
  * Copyright 2013 Adam Saturna
- * Copyright 2013 Brian Trinh
- * Copyright 2013 Ethan Mykytiuk
- * Copyright 2013 Prateek Srivastava (@f2prateek)
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
  *
- * 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
+ *  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
+ *      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.
+ *  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.
  */
 
 package com.cmput301.recipebot.test;
 
-import android.app.Instrumentation;
-import android.test.ActivityInstrumentationTestCase2;
-import com.actionbarsherlock.app.ActionBar;
+import android.support.v4.view.ViewPager;
+import com.cmput301.recipebot.R;
 import com.cmput301.recipebot.ui.MainActivity;
 import com.squareup.spoon.Spoon;
 
@@ -30,10 +29,7 @@
 /**
  * Tests of displaying the authenticator activity
  */
-public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> {
-
-    private MainActivity activity;
-    private Instrumentation instrumentation;
+public class MainActivityTest extends ActivityTest<MainActivity> {
 
     /**
      * Create test for {@link com.cmput301.recipebot.ui.MainActivity}
@@ -42,30 +38,38 @@ public MainActivityTest() {
         super(MainActivity.class);
     }
 
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        activity = getActivity();
-        instrumentation = getInstrumentation();
-    }
-
     /**
      * Verify that {@link MainActivity} exists
      * TODO: might not be required - {@link org.fest.assertions.api.ANDROID} checks for null with every test.
      */
-    public void testActivityExists() {
+    public void testMainActivityExists() {
         assertThat(activity).isNotNull();
         Spoon.screenshot(activity, "initial_state");
     }
 
     /**
      * Verify that two tabs are shown to the user.
-     * TODO : verify the titles themselves?
      */
     public void testTabsExist() {
-        Spoon.screenshot(activity, "initial_state");
-        ActionBar actionBar = activity.getSupportActionBar();
-        assertEquals(2, actionBar.getTabCount());
+        final ViewPager viewPager = (ViewPager) activity.findViewById(R.id.pager);
+
+        instrumentation.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                viewPager.setCurrentItem(0);
+            }
+        });
+        instrumentation.waitForIdleSync();
+        Spoon.screenshot(activity, "tab_0");
+
+        instrumentation.runOnMainSync(new Runnable() {
+            @Override
+            public void run() {
+                viewPager.setCurrentItem(1);
+            }
+        });
+        instrumentation.waitForIdleSync();
+        Spoon.screenshot(activity, "tab_1");
     }
 }
 
diff --git a/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java b/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java
new file mode 100644
index 0000000..242edf8
--- /dev/null
+++ b/integration-tests/src/main/java/com/cmput301/recipebot/test/RecipeActivityTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2013 Adam Saturna
+ *  Copyright 2013 Brian Trinh
+ *  Copyright 2013 Ethan Mykytiuk
+ *  Copyright 2013 Prateek Srivastava (@f2prateek)
+ *
+ *  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.
+ */
+
+package com.cmput301.recipebot.test;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v4.view.ViewPager;
+import android.test.ActivityInstrumentationTestCase2;
+import com.cmput301.recipebot.R;
+import com.cmput301.recipebot.model.Ingredient;
+import com.cmput301.recipebot.model.Recipe;
+import com.cmput301.recipebot.ui.RecipeActivity;
+import com.squareup.spoon.Spoon;
+
+import java.util.ArrayList;
+import java.util.UUID;
+
+import static org.fest.assertions.api.ANDROID.assertThat;
+
+public class RecipeActivityTest extends ActivityInstrumentationTestCase2<RecipeActivity> {
+
+    protected Instrumentation instrumentation;
+    protected RecipeActivity activity;
+
+    /**
+     * Create test for {@link com.cmput301.recipebot.ui.RecipeActivity}
+     */
+    public RecipeActivityTest() {
+        super(RecipeActivity.class);
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        instrumentation = getInstrumentation();
+        setActivityIntent(getTestIntent()); // Set intent first
+        activity = getActivity();
+    }
+
+    private Intent getTestIntent() {
+        Recipe recipe = new Recipe();
+        recipe.setId(UUID.randomUUID().toString());
+        recipe.setName("Shake and Bake Chicken");
+        recipe.setUser("Colonel Sanders");
+        ArrayList<String> directions = new ArrayList<String>();
+        directions.add("1. First Shake");
+        directions.add("2. Then Bake");
+        recipe.setDirections(directions);
+        ArrayList<Ingredient> ingredients = new ArrayList<Ingredient>();
+        ingredients.add(new Ingredient("Chicken", "g", 500f));
+        ingredients.add(new Ingredient("Shake and Bake mix", "packet", 1f));
+        ingredients.add(new Ingredient("Tequila", "bottle", 1f));
+        recipe.setIngredients(ingredients);
+        ArrayList<Uri> photos = new ArrayList<Uri>();
+        photos.add(Uri.parse("http://www.kraftrecipes.com/assets/recipe_images/SHAKE_N_BAKE_Honey_Drummies.jpg"));
+        photos.add(Uri.parse("http://images.media-allrecipes.com/userphotos/250x250/00/68/33/683349.jpg"));
+        recipe.setPhotos(photos);
+
+        Intent intent = new Intent(instrumentation.getContext(), RecipeActivity.class);
+        intent.putExtra(RecipeActivity.EXTRA_RECIPE, recipe);
+        return intent;
+    }
+
+    /**
+     * Verify that {@link RecipeActivity} exists
+     */
+    public void testRecipeActivityExists() {
+        assertThat(activity).isNotNull();
+        Spoon.screenshot(activity, "initial_state");
+    }
+
+    /**
+     * Verify that {@link RecipeActivity} exists
+     */
+    public void testVPShowsAllContent() {
+        assertThat(activity).isNotNull();
+        Spoon.screenshot(activity, "initial_state");
+
+        final ViewPager viewPager = (ViewPager) activity.findViewById(R.id.pager_recipe_images);
+
+        assertThat(viewPager.getAdapter()).hasCount(activity.mRecipe.getPhotos().size() + 1);
+
+        for (int i = 0; i < viewPager.getAdapter().getCount(); i++) {
+            final int count = i;
+            instrumentation.runOnMainSync(new Runnable() {
+                @Override
+                public void run() {
+                    viewPager.setCurrentItem(count);
+                }
+            });
+            instrumentation.waitForIdleSync();
+            Spoon.screenshot(activity, "image_" + count);
+        }
+    }
+}
diff --git a/test-cli-lab.sh b/test-cli-lab.sh
new file mode 100755
index 0000000..03b1aba
--- /dev/null
+++ b/test-cli-lab.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# Simple script to test Java-based execution of Spoon. You must have assembled
+# the jar prior to running this script (i.e., mvn clean verify).
+mvn clean verify -DskipTests=true
+
+set -e
+
+APK=`\ls app/target/*.apk`
+TEST_APK=`\ls integration-tests/target/*.apk`
+
+java -jar spoon-*-jar-with-dependencies.jar --apk "$APK" --test-apk "$TEST_APK" --output target
+
+nautilus target/index.html