diff --git a/PokemonTracker.Tests/Mocks/MockPokemonRepository.cs b/PokemonTracker.Tests/Mocks/MockPokemonRepository.cs
new file mode 100644
index 0000000..a6819fa
--- /dev/null
+++ b/PokemonTracker.Tests/Mocks/MockPokemonRepository.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using PokemonTracker.Models;
+using PokemonTracker.Repositories.Interfaces;
+using System.Linq;
+
+namespace PokemonTracker.Tests.Mocks
+{
+	public class MockPokemonRepository : IPokemonRepository
+	{
+		private List<Pokemon> _allPokemon;
+		public MockPokemonRepository(List<Pokemon> allPokemon)
+		{
+			_allPokemon = allPokemon;
+		}
+
+		public void Delete(Pokemon obj)
+		{
+			var pokemon = Find(obj.Id);
+			_allPokemon.Remove(pokemon);
+		}
+
+		public Pokemon Find(int id)
+		{
+			return _allPokemon.Find(p => p.Id == id);
+		}
+
+		public IEnumerable<Pokemon> GetAll()
+		{
+			return _allPokemon;
+		}
+
+		public void Insert(Pokemon obj)
+		{
+			_allPokemon.Add(obj);
+		}
+
+		public IEnumerable<Pokemon> Where(Expression<Func<Pokemon, bool>> where)
+		{
+			return _allPokemon.AsQueryable().Where(where).AsEnumerable();
+		}
+	}
+}
diff --git a/PokemonTracker.Tests/PokemonServiceTests.cs b/PokemonTracker.Tests/PokemonServiceTests.cs
new file mode 100644
index 0000000..f7eb735
--- /dev/null
+++ b/PokemonTracker.Tests/PokemonServiceTests.cs
@@ -0,0 +1,72 @@
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using PokemonTracker.Services.Interfaces;
+using PokemonTracker.Tests.Mocks;
+using PokemonTracker.Models;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace PokemonTracker.Tests
+{
+	[TestClass]
+	public class PokemonServiceTests
+	{
+		public static List<Pokemon> pokemonList = new List<Pokemon>
+		{
+			new Pokemon { Id = 1, Name = "Bulbasaur", Type = PokemonType.GRASS },
+			new Pokemon { Id = 2, Name = "Charmander", Type = PokemonType.FIRE },
+			new Pokemon { Id = 3, Name = "Squirtle", Type = PokemonType.WATER },
+			new Pokemon { Id = 4, Name = "Pikachu", Type = PokemonType.ELECTRIC },
+			new Pokemon { Id = 5, Name = "Jigglypuff", Type = PokemonType.FAIRY },
+			new Pokemon { Id = 6, Name = "Growlithe", Type = PokemonType.FIRE },
+			new Pokemon { Id = 7, Name = "Machamp", Type = PokemonType.FIGHTING },
+			new Pokemon { Id = 8, Name = "Magikarp", Type = PokemonType.WATER },
+			new Pokemon { Id = 9, Name = "Gyarados", Type = PokemonType.WATER },
+			new Pokemon { Id = 10, Name = "Dragonite", Type = PokemonType.DRAGON }
+		};
+
+		public static List<Pokemon> pokemonWithT = new List<Pokemon>
+		{
+			new Pokemon { Id = 3, Name = "Squirtle", Type = PokemonType.WATER },
+			new Pokemon { Id = 6, Name = "Growlithe", Type = PokemonType.FIRE },
+			new Pokemon { Id = 10, Name = "Dragonite", Type = PokemonType.DRAGON }
+		};
+
+		private PokemonService GetService()
+		{
+			var mockRepo = new MockPokemonRepository(pokemonList);
+			return new PokemonService(mockRepo);
+		}
+
+		[TestMethod]
+		public void TestGetAllPokemon()
+		{
+			var service = GetService();
+			var allPokemon = service.GetAllPokemon();
+			CompareLists(allPokemon.ToList(), pokemonList);
+		}
+
+		[TestMethod]
+		public void TestSearchPokemon()
+		{
+			var service = GetService();
+			var pokemonSearchedByT = service.SearchPokemonForKey("t");
+			CompareLists(pokemonSearchedByT.ToList(), pokemonWithT);
+		}
+
+		private void CompareLists(List<Pokemon> actual, List<Pokemon> expected)
+		{
+			Assert.AreEqual(actual.Count, expected.Count);
+
+			for (var i = 0; i < actual.Count; i++)
+			{
+				var a = actual.ElementAt(i);
+				var e = expected.ElementAt(i);
+
+				Assert.AreEqual(a.Id, e.Id);
+				Assert.AreEqual(a.Name, e.Name);
+				Assert.AreEqual(a.Type, e.Type);
+			}
+		}
+	}
+}
diff --git a/PokemonTracker.Tests/PokemonTracker.Tests.csproj b/PokemonTracker.Tests/PokemonTracker.Tests.csproj
index abb2572..4a13a29 100644
--- a/PokemonTracker.Tests/PokemonTracker.Tests.csproj
+++ b/PokemonTracker.Tests/PokemonTracker.Tests.csproj
@@ -48,7 +48,8 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="UnitTest1.cs" />
+    <Compile Include="Mocks\MockPokemonRepository.cs" />
+    <Compile Include="PokemonServiceTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -57,6 +58,9 @@
       <Name>PokemonTracker</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/PokemonTracker.Tests/UnitTest1.cs b/PokemonTracker.Tests/UnitTest1.cs
deleted file mode 100644
index 4eb5643..0000000
--- a/PokemonTracker.Tests/UnitTest1.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace PokemonTracker.Tests
-{
- [TestClass]
- public class UnitTest1
- {
-  [TestMethod]
-  public void TestMethod1()
-  {
-  }
- }
-}
diff --git a/PokemonTracker.Tests/app.config b/PokemonTracker.Tests/app.config
new file mode 100644
index 0000000..d7256aa
--- /dev/null
+++ b/PokemonTracker.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/PokemonTracker/App_Start/Bootstrapper.cs b/PokemonTracker/App_Start/Bootstrapper.cs
new file mode 100644
index 0000000..931af0a
--- /dev/null
+++ b/PokemonTracker/App_Start/Bootstrapper.cs
@@ -0,0 +1,32 @@
+using Microsoft.Practices.Unity;
+using Microsoft.Practices.Unity.Mvc;
+using PokemonTracker.Repositories;
+using PokemonTracker.Repositories.Interfaces;
+using PokemonTracker.Services;
+using PokemonTracker.Services.Interfaces;
+using System.Web.Mvc;
+
+namespace PokemonTracker
+{
+	public class Bootstrapper
+	{
+		public static void Initialise()
+		{
+			var container = BuildUnityContainer();
+			DependencyResolver.SetResolver(new UnityDependencyResolver(container));
+		}
+
+		private static IUnityContainer BuildUnityContainer()
+		{
+			var container = new UnityContainer();
+
+			container.RegisterType<IPokemonRepository, PokemonRepository>();
+			container.RegisterType<ITrainerRepository, TrainerRepository>();
+
+			container.RegisterType<IPokemonService, PokemonService>();
+			container.RegisterType<ITrainerService, TrainerService>();
+
+			return container;
+		}
+	}
+}
\ No newline at end of file
diff --git a/PokemonTracker/App_Start/RouteConfig.cs b/PokemonTracker/App_Start/RouteConfig.cs
index 10db4ce..f59f3d4 100644
--- a/PokemonTracker/App_Start/RouteConfig.cs
+++ b/PokemonTracker/App_Start/RouteConfig.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace PokemonTracker
diff --git a/PokemonTracker/App_Start/UnityConfig.cs b/PokemonTracker/App_Start/UnityConfig.cs
new file mode 100644
index 0000000..54b7fae
--- /dev/null
+++ b/PokemonTracker/App_Start/UnityConfig.cs
@@ -0,0 +1,42 @@
+using System;
+using Microsoft.Practices.Unity;
+using Microsoft.Practices.Unity.Configuration;
+
+namespace PokemonTracker.App_Start
+{
+    /// <summary>
+    /// Specifies the Unity configuration for the main container.
+    /// </summary>
+    public class UnityConfig
+    {
+        #region Unity Container
+        private static Lazy<IUnityContainer> container = new Lazy<IUnityContainer>(() =>
+        {
+            var container = new UnityContainer();
+            RegisterTypes(container);
+            return container;
+        });
+
+        /// <summary>
+        /// Gets the configured Unity container.
+        /// </summary>
+        public static IUnityContainer GetConfiguredContainer()
+        {
+            return container.Value;
+        }
+        #endregion
+
+        /// <summary>Registers the type mappings with the Unity container.</summary>
+        /// <param name="container">The unity container to configure.</param>
+        /// <remarks>There is no need to register concrete types such as controllers or API controllers (unless you want to 
+        /// change the defaults), as Unity allows resolving a concrete type even if it was not previously registered.</remarks>
+        public static void RegisterTypes(IUnityContainer container)
+        {
+            // NOTE: To load from web.config uncomment the line below. Make sure to add a Microsoft.Practices.Unity.Configuration to the using statements.
+            // container.LoadConfiguration();
+
+            // TODO: Register your types here
+            // container.RegisterType<IProductRepository, ProductRepository>();
+        }
+    }
+}
diff --git a/PokemonTracker/App_Start/UnityMvcActivator.cs b/PokemonTracker/App_Start/UnityMvcActivator.cs
new file mode 100644
index 0000000..c612107
--- /dev/null
+++ b/PokemonTracker/App_Start/UnityMvcActivator.cs
@@ -0,0 +1,34 @@
+using System.Linq;
+using System.Web.Mvc;
+using Microsoft.Practices.Unity.Mvc;
+
+[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(PokemonTracker.App_Start.UnityWebActivator), "Start")]
+[assembly: WebActivatorEx.ApplicationShutdownMethod(typeof(PokemonTracker.App_Start.UnityWebActivator), "Shutdown")]
+
+namespace PokemonTracker.App_Start
+{
+    /// <summary>Provides the bootstrapping for integrating Unity with ASP.NET MVC.</summary>
+    public static class UnityWebActivator
+    {
+        /// <summary>Integrates Unity when the application starts.</summary>
+        public static void Start() 
+        {
+            var container = UnityConfig.GetConfiguredContainer();
+
+            FilterProviders.Providers.Remove(FilterProviders.Providers.OfType<FilterAttributeFilterProvider>().First());
+            FilterProviders.Providers.Add(new UnityFilterAttributeFilterProvider(container));
+
+            DependencyResolver.SetResolver(new UnityDependencyResolver(container));
+
+            // TODO: Uncomment if you want to use PerRequestLifetimeManager
+            // Microsoft.Web.Infrastructure.DynamicModuleHelper.DynamicModuleUtility.RegisterModule(typeof(UnityPerRequestHttpModule));
+        }
+
+        /// <summary>Disposes the Unity container when the application is shut down.</summary>
+        public static void Shutdown()
+        {
+            var container = UnityConfig.GetConfiguredContainer();
+            container.Dispose();
+        }
+    }
+}
\ No newline at end of file
diff --git a/PokemonTracker/Controllers/HomeController.cs b/PokemonTracker/Controllers/HomeController.cs
index 4923ca3..1f3e3ff 100644
--- a/PokemonTracker/Controllers/HomeController.cs
+++ b/PokemonTracker/Controllers/HomeController.cs
@@ -1,20 +1,19 @@
-using PokemonTracker.Services;
+using PokemonTracker.Models.ViewModels;
 using PokemonTracker.Services.Interfaces;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
 using System.Web.Mvc;
 
 namespace PokemonTracker.Controllers
 {
 	public class HomeController : Controller
 	{
-		private IHomeService _homeService;
+		private IPokemonService _pokemonService;
+		private ITrainerService _trainerService;
 
-		public HomeController()
+		public HomeController(IPokemonService pokemonService, ITrainerService trainerService)
 		{
-			_homeService = new HomeService();
+			_pokemonService = pokemonService;
+			_trainerService = trainerService;
 		}
 
 		// Http GET by default
@@ -22,8 +21,13 @@ public HomeController()
 		// Note how there is a Views/Home/Index.cshtml file -  this is what View() references
 		public ActionResult Index()
 		{
-			var model = _homeService.GetHomeViewModel();
-			return View(model);
+			var viewModel = new HomeViewModel()
+			{
+				Pokemons = _pokemonService.GetAllPokemon(),
+				Trainers = _trainerService.GetAllTrainers()
+			};
+
+			return View(viewModel);
 		}
 
 		// again, notice the corresponding Views/Home/Search file
@@ -34,8 +38,14 @@ public ActionResult Search(string param)
 				return RedirectToAction("Index");
 			}
 
-			var model = _homeService.GetSearchViewModel(param);
-			return View(model);
+			var viewModel = new SearchViewModel()
+			{
+				Pokemons = _pokemonService.SearchPokemonForKey(param),
+				Trainers = _trainerService.SearchTrainersForKey(param),
+				SearchParam = param
+			};
+
+			return View(viewModel);
 		}
 	}
 }
\ No newline at end of file
diff --git a/PokemonTracker/Global.asax.cs b/PokemonTracker/Global.asax.cs
index 79dff30..ece6314 100644
--- a/PokemonTracker/Global.asax.cs
+++ b/PokemonTracker/Global.asax.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
+using System.Web.Mvc;
 using System.Web.Routing;
 
 namespace PokemonTracker
@@ -13,6 +9,7 @@ protected void Application_Start()
         {
             AreaRegistration.RegisterAllAreas();
             RouteConfig.RegisterRoutes(RouteTable.Routes);
+            Bootstrapper.Initialise();
         }
     }
 }
diff --git a/PokemonTracker/PokemonTracker.csproj b/PokemonTracker/PokemonTracker.csproj
index e896bf2..dfe3d97 100644
--- a/PokemonTracker/PokemonTracker.csproj
+++ b/PokemonTracker/PokemonTracker.csproj
@@ -84,6 +84,26 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity.Mvc, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.Mvc.4.0.1\lib\net45\Microsoft.Practices.Unity.Mvc.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
+      <HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
     <Reference Include="System.Web.DynamicData" />
@@ -102,6 +122,10 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
+    <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Web.Razor">
@@ -132,6 +156,9 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Start\RouteConfig.cs" />
+    <Compile Include="App_Start\Bootstrapper.cs" />
+    <Compile Include="App_Start\UnityConfig.cs" />
+    <Compile Include="App_Start\UnityMvcActivator.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
@@ -148,11 +175,14 @@
     <Compile Include="Models\ViewModels\SearchViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repositories\Interfaces\IPokemonRepository.cs" />
+    <Compile Include="Repositories\Interfaces\IRepository.cs" />
     <Compile Include="Repositories\Interfaces\ITrainerRepository.cs" />
     <Compile Include="Repositories\PokemonRepository.cs" />
     <Compile Include="Repositories\TrainerRepository.cs" />
-    <Compile Include="Services\HomeService.cs" />
-    <Compile Include="Services\Interfaces\IHomeService.cs" />
+    <Compile Include="Services\Interfaces\IPokemonService.cs" />
+    <Compile Include="Services\Interfaces\ITrainerService.cs" />
+    <Compile Include="Services\PokemonService.cs" />
+    <Compile Include="Services\TrainerService.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\web.config" />
diff --git a/PokemonTracker/Repositories/Interfaces/IPokemonRepository.cs b/PokemonTracker/Repositories/Interfaces/IPokemonRepository.cs
index 9a2b4fe..36572e8 100644
--- a/PokemonTracker/Repositories/Interfaces/IPokemonRepository.cs
+++ b/PokemonTracker/Repositories/Interfaces/IPokemonRepository.cs
@@ -1,21 +1,7 @@
 using PokemonTracker.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PokemonTracker.Repositories.Interfaces
 {
-	// don't take these return types to be the best way to do things -
-	//   maybe you want to return bools or some status..
-	// didn't include Update since this is a dummy
-	public interface IPokemonRepository
-	{
-		IEnumerable<Pokemon> GetAll();
-		IEnumerable<Pokemon> SearchByKey(string key);
-		Pokemon GetById(int id);
-		void Insert(Pokemon pokemon);
-		void Delete(int id);
-	}
+	public interface IPokemonRepository : IRepository<Pokemon>
+	{ }
 }
diff --git a/PokemonTracker/Repositories/Interfaces/IRepository.cs b/PokemonTracker/Repositories/Interfaces/IRepository.cs
new file mode 100644
index 0000000..01bb5ad
--- /dev/null
+++ b/PokemonTracker/Repositories/Interfaces/IRepository.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+
+namespace PokemonTracker.Repositories.Interfaces
+{
+	public interface IRepository<T> where T : class
+	{
+		IEnumerable<T> GetAll();
+		IEnumerable<T> Where(Expression<Func<T, bool>> where);
+		T Find(int id);
+		void Insert(T obj);
+		void Delete(T obj);
+	}
+}
diff --git a/PokemonTracker/Repositories/Interfaces/ITrainerRepository.cs b/PokemonTracker/Repositories/Interfaces/ITrainerRepository.cs
index ada5b98..1f1d8f0 100644
--- a/PokemonTracker/Repositories/Interfaces/ITrainerRepository.cs
+++ b/PokemonTracker/Repositories/Interfaces/ITrainerRepository.cs
@@ -1,21 +1,8 @@
 using PokemonTracker.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace PokemonTracker.Repositories.Interfaces
 {
-	// don't take these return types to be the best way to do things -
-	//   maybe you want to return bools or some status..
-	// didn't include Update since this is a dummy
-	public interface ITrainerRepository
+	public interface ITrainerRepository : IRepository<Trainer>
 	{
-		IEnumerable<Trainer> GetAll();
-		IEnumerable<Trainer> SearchByKey(string key);
-		Trainer GetById(int id);
-		void Insert(Trainer trainer);
-		void Delete(int id);
 	}
 }
diff --git a/PokemonTracker/Repositories/PokemonRepository.cs b/PokemonTracker/Repositories/PokemonRepository.cs
index 81949cb..1be4d36 100644
--- a/PokemonTracker/Repositories/PokemonRepository.cs
+++ b/PokemonTracker/Repositories/PokemonRepository.cs
@@ -2,8 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Web;
 using PokemonTracker.Models;
+using System.Linq.Expressions;
 
 namespace PokemonTracker.Repositories
 {
@@ -16,32 +16,32 @@ public PokemonRepository()
 			_context = new PokemonTrackerContext();
 		}
 
-		public void Delete(int id)
+		public void Delete(Pokemon obj)
 		{
-			var pokemon = GetById(id);
+			var pokemon = Find(obj.Id);
 			_context.Pokemons.Remove(pokemon);
 			_context.SaveChanges();
 		}
 
-		public IEnumerable<Pokemon> GetAll()
+		public Pokemon Find(int id)
 		{
-			return _context.Pokemons.AsEnumerable();
+			return _context.Pokemons.Find(id);
 		}
 
-		public IEnumerable<Pokemon> SearchByKey(string key)
+		public IEnumerable<Pokemon> GetAll()
 		{
-			return _context.Pokemons.Where(t => t.Name.Contains(key));
+			return _context.Pokemons.AsEnumerable();
 		}
 
-		public Pokemon GetById(int id)
+		public void Insert(Pokemon obj)
 		{
-			return _context.Pokemons.AsQueryable().Where(p => p.Id == id).FirstOrDefault();
+			_context.Pokemons.Add(obj);
+			_context.SaveChanges();
 		}
 
-		public void Insert(Pokemon pokemon)
+		public IEnumerable<Pokemon> Where(Expression<Func<Pokemon, bool>> where)
 		{
-			_context.Pokemons.Add(pokemon);
-			_context.SaveChanges();
+			return GetAll().AsQueryable().Where(where);
 		}
 	}
 }
\ No newline at end of file
diff --git a/PokemonTracker/Repositories/TrainerRepository.cs b/PokemonTracker/Repositories/TrainerRepository.cs
index 20f654a..af9ab16 100644
--- a/PokemonTracker/Repositories/TrainerRepository.cs
+++ b/PokemonTracker/Repositories/TrainerRepository.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Web;
 
 namespace PokemonTracker.Repositories
@@ -16,32 +17,32 @@ public TrainerRepository()
 			_context = new PokemonTrackerContext();
 		}
 
-		public void Delete(int index)
+		public void Delete(Trainer obj)
 		{
-			var trainer = GetById(index);
+			var trainer = Find(obj.Id);
 			_context.Trainers.Remove(trainer);
 			_context.SaveChanges();
 		}
 
-		public IEnumerable<Trainer> GetAll()
+		public Trainer Find(int id)
 		{
-			return _context.Trainers.AsEnumerable();
+			return _context.Trainers.Find(id);
 		}
 
-		public IEnumerable<Trainer> SearchByKey(string key)
+		public IEnumerable<Trainer> GetAll()
 		{
-			return _context.Trainers.Where(t => t.Name.Contains(key));
+			return _context.Trainers.AsEnumerable();
 		}
 
-		public Trainer GetById(int id)
+		public void Insert(Trainer obj)
 		{
-			return _context.Trainers.AsQueryable().Where(t => t.Id == id).FirstOrDefault();
+			_context.Trainers.Add(obj);
+			_context.SaveChanges();
 		}
 
-		public void Insert(Trainer trainer)
+		public IEnumerable<Trainer> Where(Expression<Func<Trainer, bool>> where)
 		{
-			_context.Trainers.Add(trainer);
-			_context.SaveChanges();
+			return GetAll().AsQueryable().Where(where);
 		}
 	}
 }
\ No newline at end of file
diff --git a/PokemonTracker/Services/HomeService.cs b/PokemonTracker/Services/HomeService.cs
deleted file mode 100644
index 30c9619..0000000
--- a/PokemonTracker/Services/HomeService.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using PokemonTracker.Services.Interfaces;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using PokemonTracker.Models.ViewModels;
-using PokemonTracker.Repositories.Interfaces;
-using PokemonTracker.Repositories;
-
-namespace PokemonTracker.Services
-{
-	public class HomeService : IHomeService
-	{
-		private IPokemonRepository _pokemonRepo;
-		private ITrainerRepository _trainerRepo;
-
-		public HomeService()
-		{
-			_pokemonRepo = new PokemonRepository();
-			_trainerRepo = new TrainerRepository();
-		}
-
-		public HomeViewModel GetHomeViewModel()
-		{
-			return new HomeViewModel()
-			{
-				Pokemons = _pokemonRepo.GetAll(),
-				Trainers = _trainerRepo.GetAll()
-			};
-		}
-
-		public SearchViewModel GetSearchViewModel(string param)
-		{
-			return new SearchViewModel()
-			{
-				SearchParam = param,
-				Pokemons = _pokemonRepo.SearchByKey(param),
-				Trainers = _trainerRepo.SearchByKey(param)
-			};
-		}
-	}
-}
\ No newline at end of file
diff --git a/PokemonTracker/Services/Interfaces/IHomeService.cs b/PokemonTracker/Services/Interfaces/IHomeService.cs
deleted file mode 100644
index d5900ab..0000000
--- a/PokemonTracker/Services/Interfaces/IHomeService.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using PokemonTracker.Models.ViewModels;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PokemonTracker.Services.Interfaces
-{
-	public interface IHomeService
-	{
-		HomeViewModel GetHomeViewModel();
-		SearchViewModel GetSearchViewModel(string param);
-	}
-}
diff --git a/PokemonTracker/Services/Interfaces/IPokemonService.cs b/PokemonTracker/Services/Interfaces/IPokemonService.cs
new file mode 100644
index 0000000..8f776fc
--- /dev/null
+++ b/PokemonTracker/Services/Interfaces/IPokemonService.cs
@@ -0,0 +1,11 @@
+using PokemonTracker.Models;
+using System.Collections.Generic;
+
+namespace PokemonTracker.Services.Interfaces
+{
+	public interface IPokemonService
+	{
+		IEnumerable<Pokemon> GetAllPokemon();
+		IEnumerable<Pokemon> SearchPokemonForKey(string key);
+	}
+}
diff --git a/PokemonTracker/Services/Interfaces/ITrainerService.cs b/PokemonTracker/Services/Interfaces/ITrainerService.cs
new file mode 100644
index 0000000..de53b7a
--- /dev/null
+++ b/PokemonTracker/Services/Interfaces/ITrainerService.cs
@@ -0,0 +1,11 @@
+using PokemonTracker.Models;
+using System.Collections.Generic;
+
+namespace PokemonTracker.Services.Interfaces
+{
+	public interface ITrainerService
+	{
+		IEnumerable<Trainer> GetAllTrainers();
+		IEnumerable<Trainer> SearchTrainersForKey(string key);
+	}
+}
diff --git a/PokemonTracker/Services/PokemonService.cs b/PokemonTracker/Services/PokemonService.cs
new file mode 100644
index 0000000..7254898
--- /dev/null
+++ b/PokemonTracker/Services/PokemonService.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using PokemonTracker.Models;
+using PokemonTracker.Repositories.Interfaces;
+
+namespace PokemonTracker.Services.Interfaces
+{
+	public class PokemonService : IPokemonService
+	{
+		private IPokemonRepository _pokemonRepo;
+
+		public PokemonService(IPokemonRepository pokemonRepo)
+		{
+			_pokemonRepo = pokemonRepo;
+		}
+
+		public IEnumerable<Pokemon> GetAllPokemon()
+		{
+			return _pokemonRepo.GetAll();
+		}
+
+		public IEnumerable<Pokemon> SearchPokemonForKey(string key)
+		{
+			return _pokemonRepo.Where(p => p.Name.Contains(key));
+		}
+	}
+}
\ No newline at end of file
diff --git a/PokemonTracker/Services/TrainerService.cs b/PokemonTracker/Services/TrainerService.cs
new file mode 100644
index 0000000..8717d42
--- /dev/null
+++ b/PokemonTracker/Services/TrainerService.cs
@@ -0,0 +1,27 @@
+using PokemonTracker.Models;
+using PokemonTracker.Repositories.Interfaces;
+using PokemonTracker.Services.Interfaces;
+using System.Collections.Generic;
+
+namespace PokemonTracker.Services
+{
+	public class TrainerService : ITrainerService
+	{
+		private ITrainerRepository _trainerRepo;
+
+		public TrainerService(ITrainerRepository trainerRepo)
+		{
+			_trainerRepo = trainerRepo;
+		}
+
+		public IEnumerable<Trainer> GetAllTrainers()
+		{
+			return _trainerRepo.GetAll();
+		}
+
+		public IEnumerable<Trainer> SearchTrainersForKey(string key)
+		{
+			return _trainerRepo.Where(t => t.Name.Contains(key));
+		}
+	}
+}
\ No newline at end of file
diff --git a/PokemonTracker/Web.config b/PokemonTracker/Web.config
index ac56872..99f4fda 100644
--- a/PokemonTracker/Web.config
+++ b/PokemonTracker/Web.config
@@ -33,7 +33,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/PokemonTracker/packages.config b/PokemonTracker/packages.config
index e815065..2ab65a2 100644
--- a/PokemonTracker/packages.config
+++ b/PokemonTracker/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net452" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net452" />
   <package id="Microsoft.ApplicationInsights" version="2.2.0" targetFramework="net452" />
   <package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.6" targetFramework="net452" />
@@ -14,4 +15,7 @@
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="1.0.0" targetFramework="net452" />
   <package id="Microsoft.Net.Compilers" version="1.0.0" targetFramework="net452" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
+  <package id="Unity" version="4.0.1" targetFramework="net452" />
+  <package id="Unity.Mvc" version="4.0.1" targetFramework="net452" />
+  <package id="WebActivatorEx" version="2.0" targetFramework="net452" />
 </packages>
\ No newline at end of file