diff --git a/starter-code/ShoppingListVer2/.idea/gradle.xml b/starter-code/ShoppingListVer2/.idea/gradle.xml
index 8d2df47..39139a6 100644
--- a/starter-code/ShoppingListVer2/.idea/gradle.xml
+++ b/starter-code/ShoppingListVer2/.idea/gradle.xml
@@ -3,8 +3,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.8" />
         <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
diff --git a/starter-code/ShoppingListVer2/.idea/misc.xml b/starter-code/ShoppingListVer2/.idea/misc.xml
index 5d19981..fbb6828 100644
--- a/starter-code/ShoppingListVer2/.idea/misc.xml
+++ b/starter-code/ShoppingListVer2/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/DatabaseHelper.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/DatabaseHelper.java
new file mode 100644
index 0000000..61f3c6a
--- /dev/null
+++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/DatabaseHelper.java
@@ -0,0 +1,57 @@
+package ly.generalassemb.drewmahrt.shoppinglistver2;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteOpenHelper;
+
+/**
+ * Created by faraz on 2/2/16.
+ */
+public class DatabaseHelper extends SQLiteOpenHelper {
+
+    public static final String TABLE_NAME = "SHOPPING_LIST";
+    public static final String ID = "_id";
+    public static final String ITEM_NAME = "ITEM_NAME";
+    public static final String DESCRIPTION = "DESCRIPTION";
+    public static final String PRICE = "PRICE";
+    public static final String TYPE = "TYPE";
+    public static final String TEXT = "TEXT";
+
+    public DatabaseHelper(Context context, String name, SQLiteDatabase.CursorFactory factory, int version) {
+        super(context, name, factory, version);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        final String CREATE_TABLE = "CREATE TABLE " +
+                TABLE_NAME +
+                " (" + ID + " INTEGER PRIMARY KEY, " +
+                ITEM_NAME + " " +
+                TEXT + ", " +
+                DESCRIPTION + " " +
+                TEXT + ", " +
+                PRICE + " " +
+                TEXT + ", " +
+                TYPE + " " +
+                TEXT + ")";
+
+        db.execSQL(CREATE_TABLE);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+        onCreate(db);
+    }
+
+    public void insert(int id, String itemName, String description, String price, String type) {
+        SQLiteDatabase db = getReadableDatabase();
+        db.execSQL("INSERT INTO " + TABLE_NAME + " VALUES ('" + id + "', '" + itemName + "', '" + description + "', '" + price + "', '" + type + "')");
+    }
+
+    public Cursor getValues() {
+        SQLiteDatabase db = getReadableDatabase();
+        return db.query(TABLE_NAME, null, null, null, null, null, null);
+    }
+}
diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java
index beff131..ab4e1f6 100644
--- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java
+++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/MainActivity.java
@@ -1,12 +1,11 @@
 package ly.generalassemb.drewmahrt.shoppinglistver2;
 
-import android.content.Context;
+import android.app.SearchManager;
 import android.database.Cursor;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CursorAdapter;
+import android.support.v7.app.AppCompatActivity;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.widget.ListView;
 import android.widget.SimpleCursorAdapter;
 
@@ -18,9 +17,31 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        //Ignore the two lines below, they are for setup
         DBAssetHelper dbSetup = new DBAssetHelper(MainActivity.this);
         dbSetup.getReadableDatabase();
 
+        DatabaseHelper helper = new DatabaseHelper(MainActivity.this, "SHOPPING_DB", null, 9);
+
+        helper.insert(2, "Name", "Description", "100", "Type");
+
+        Cursor cursor = helper.getValues();
+        cursor.moveToFirst();
+
+        String[] columns = new String[]{DatabaseHelper.ID, DatabaseHelper.ITEM_NAME, DatabaseHelper.DESCRIPTION,
+                DatabaseHelper.PRICE, DatabaseHelper.TYPE};
+        int[] intArray = new int[]{android.R.id.text1};
+
+        SimpleCursorAdapter simpleCursorAdapter = new SimpleCursorAdapter(MainActivity.this, android.R.layout.simple_list_item_1, cursor, columns, intArray, 0);
+
+        ListView listView = (ListView) findViewById(R.id.shopping_list_view);
+        listView.setAdapter(simpleCursorAdapter);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.search_options_menu, menu);
+        SearchManager searchManager = (SearchManager) getSystemService(SEARCH_SERVICE);
+        return true;
     }
 }
diff --git a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java
index beeea73..b34c691 100644
--- a/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java
+++ b/starter-code/ShoppingListVer2/app/src/main/java/ly/generalassemb/drewmahrt/shoppinglistver2/setup/DBAssetHelper.java
@@ -10,7 +10,7 @@
 public class DBAssetHelper extends SQLiteAssetHelper {
 
     private static final String DATABASE_NAME = "SHOPPING_DB";
-    private static final int DATABASE_VERSION = 7;
+    private static final int DATABASE_VERSION = 9;
 
     public DBAssetHelper(Context context) {
         super(context, DATABASE_NAME, null, DATABASE_VERSION);
diff --git a/starter-code/ShoppingListVer2/app/src/main/res/menu/search_options_menu.xml b/starter-code/ShoppingListVer2/app/src/main/res/menu/search_options_menu.xml
new file mode 100644
index 0000000..400a2bf
--- /dev/null
+++ b/starter-code/ShoppingListVer2/app/src/main/res/menu/search_options_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/search"
+          android:title="Search"
+          android:icon="@android:drawable/ic_menu_search"
+          app:showAsAction="collapseActionView"/>
+</menu>
\ No newline at end of file
diff --git a/starter-code/ShoppingListVer2/app/src/main/res/xml/searchable.xml b/starter-code/ShoppingListVer2/app/src/main/res/xml/searchable.xml
new file mode 100644
index 0000000..9c8a042
--- /dev/null
+++ b/starter-code/ShoppingListVer2/app/src/main/res/xml/searchable.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable xmlns:android="http://schemas.android.com/apk/res/android"
+            android:label="@string/app_name"
+            android:hint="Search for something..."/>
\ No newline at end of file