diff --git a/MvcMusicStore/Controllers/HomeController.cs b/MvcMusicStore/Controllers/HomeController.cs
index 6226311..dcd06ec 100644
--- a/MvcMusicStore/Controllers/HomeController.cs
+++ b/MvcMusicStore/Controllers/HomeController.cs
@@ -1,16 +1,13 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
+using MvcMusicStore.Data;
 
 namespace MvcMusicStore.Controllers
 {
     public class HomeController : Controller
     {
-        public String Index()
+        public ActionResult Index()
         {
-            return "I like cake!";
+            return View();
         }
 
         public ActionResult About()
@@ -26,5 +23,10 @@ namespace MvcMusicStore.Controllers
 
             return View();
         }
+
+        //public ActionResult Search(string q)
+        //{
+        //    var albums = 
+        //}
     }
 }
\ No newline at end of file
diff --git a/MvcMusicStore/Models/AlbumEditViewModel.cs b/MvcMusicStore/Models/AlbumEditViewModel.cs
new file mode 100644
index 0000000..a4091f6
--- /dev/null
+++ b/MvcMusicStore/Models/AlbumEditViewModel.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace MvcMusicStore.Models
+{
+    public class AlbumEditViewModel
+    {
+        public Album AlbumToEdit { get; set; }
+        public System.Web.Mvc.SelectList Genres { get; set; }
+        public System.Web.Mvc.SelectList Artists { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/MvcMusicStore/MvcMusicStore.csproj b/MvcMusicStore/MvcMusicStore.csproj
index c5a85f9..5ab7322 100644
--- a/MvcMusicStore/MvcMusicStore.csproj
+++ b/MvcMusicStore/MvcMusicStore.csproj
@@ -134,6 +134,7 @@
       <DependentUpon>Global.asax</DependentUpon>
     </Compile>
     <Compile Include="Models\Album.cs" />
+    <Compile Include="Models\AlbumEditViewModel.cs" />
     <Compile Include="Models\Artist.cs" />
     <Compile Include="Models\Genre.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/MvcMusicStore/Views/Home/Index.cshtml b/MvcMusicStore/Views/Home/Index.cshtml
index 32e1dd9..0fe50d8 100644
--- a/MvcMusicStore/Views/Home/Index.cshtml
+++ b/MvcMusicStore/Views/Home/Index.cshtml
@@ -28,4 +28,9 @@
         <p>You can easily find a web hosting company that offers the right mix of features and price for your applications.</p>
         <p><a class="btn btn-default" href="https://go.microsoft.com/fwlink/?LinkId=301867">Learn more &raquo;</a></p>
     </div>
-</div>
\ No newline at end of file
+</div>
+
+<form action="/Home/Search" method="get">
+    <input type="text" name="q" />
+    <input type="submit" value="Search" />
+</form>
\ No newline at end of file