diff --git a/PlexRequests.Api.Interfaces/IPlexApi.cs b/PlexRequests.Api.Interfaces/IPlexApi.cs
new file mode 100644
index 000000000..3ce0ee7d0
--- /dev/null
+++ b/PlexRequests.Api.Interfaces/IPlexApi.cs
@@ -0,0 +1,40 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: IPlexApi.cs
+//    Created By: Jamie Rees
+//   
+//    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.
+//  ************************************************************************/
+#endregion
+using System;
+
+using PlexRequests.Api.Models;
+
+namespace PlexRequests.Api.Interfaces
+{
+    public interface IPlexApi
+    {
+        PlexAuthentication SignIn(string username, string password);
+        PlexFriends GetUsers(string authToken);
+        PlexSearch SearchContent(string authToken, string searchTerm, Uri plexFullHost);
+
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
index 1a0290cd1..005a42c47 100644
--- a/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
+++ b/PlexRequests.Api.Interfaces/PlexRequests.Api.Interfaces.csproj
@@ -46,11 +46,18 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="IApiRequest.cs" />
+    <Compile Include="IPlexApi.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+      <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
+      <Name>PlexRequests.Api.Models</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/PlexRequests.Api/Models/Movie/CouchPotatoAdd.cs b/PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs
similarity index 100%
rename from PlexRequests.Api/Models/Movie/CouchPotatoAdd.cs
rename to PlexRequests.Api.Models/Movie/CouchPotatoAdd.cs
diff --git a/PlexRequests.Api/Models/PlexAuthentication.cs b/PlexRequests.Api.Models/Plex/PlexAuthentication.cs
similarity index 100%
rename from PlexRequests.Api/Models/PlexAuthentication.cs
rename to PlexRequests.Api.Models/Plex/PlexAuthentication.cs
diff --git a/PlexRequests.Api/Models/PlexError.cs b/PlexRequests.Api.Models/Plex/PlexError.cs
similarity index 100%
rename from PlexRequests.Api/Models/PlexError.cs
rename to PlexRequests.Api.Models/Plex/PlexError.cs
diff --git a/PlexRequests.Api/Models/PlexFriends.cs b/PlexRequests.Api.Models/Plex/PlexFriends.cs
similarity index 100%
rename from PlexRequests.Api/Models/PlexFriends.cs
rename to PlexRequests.Api.Models/Plex/PlexFriends.cs
diff --git a/PlexRequests.Api/Models/PlexSearch.cs b/PlexRequests.Api.Models/Plex/PlexSearch.cs
similarity index 100%
rename from PlexRequests.Api/Models/PlexSearch.cs
rename to PlexRequests.Api.Models/Plex/PlexSearch.cs
diff --git a/PlexRequests.Api/Models/PlexUserRequest.cs b/PlexRequests.Api.Models/Plex/PlexUserRequest.cs
similarity index 100%
rename from PlexRequests.Api/Models/PlexUserRequest.cs
rename to PlexRequests.Api.Models/Plex/PlexUserRequest.cs
diff --git a/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
new file mode 100644
index 000000000..6025b2705
--- /dev/null
+++ b/PlexRequests.Api.Models/PlexRequests.Api.Models.csproj
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PlexRequests.Api.Models</RootNamespace>
+    <AssemblyName>PlexRequests.Api.Models</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Movie\CouchPotatoAdd.cs" />
+    <Compile Include="Plex\PlexAuthentication.cs" />
+    <Compile Include="Plex\PlexError.cs" />
+    <Compile Include="Plex\PlexFriends.cs" />
+    <Compile Include="Plex\PlexSearch.cs" />
+    <Compile Include="Plex\PlexUserRequest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Tv\Authentication.cs" />
+    <Compile Include="Tv\TvSearchResult.cs" />
+    <Compile Include="Tv\TvShow.cs" />
+    <Compile Include="Tv\TvShowImages.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/PlexRequests.Api.Models/Properties/AssemblyInfo.cs b/PlexRequests.Api.Models/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..2774b1281
--- /dev/null
+++ b/PlexRequests.Api.Models/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PlexRequests.Api.Models")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("PlexRequests.Api.Models")]
+[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("cb37a5f8-6dfc-4554-99d3-a42b502e4591")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/PlexRequests.Api/Models/Tv/Authentication.cs b/PlexRequests.Api.Models/Tv/Authentication.cs
similarity index 100%
rename from PlexRequests.Api/Models/Tv/Authentication.cs
rename to PlexRequests.Api.Models/Tv/Authentication.cs
diff --git a/PlexRequests.Api/Models/Tv/TvSearchResult.cs b/PlexRequests.Api.Models/Tv/TvSearchResult.cs
similarity index 100%
rename from PlexRequests.Api/Models/Tv/TvSearchResult.cs
rename to PlexRequests.Api.Models/Tv/TvSearchResult.cs
diff --git a/PlexRequests.Api/Models/Tv/TvShow.cs b/PlexRequests.Api.Models/Tv/TvShow.cs
similarity index 100%
rename from PlexRequests.Api/Models/Tv/TvShow.cs
rename to PlexRequests.Api.Models/Tv/TvShow.cs
diff --git a/PlexRequests.Api/Models/Tv/TvShowImages.cs b/PlexRequests.Api.Models/Tv/TvShowImages.cs
similarity index 100%
rename from PlexRequests.Api/Models/Tv/TvShowImages.cs
rename to PlexRequests.Api.Models/Tv/TvShowImages.cs
diff --git a/PlexRequests.Api/PlexApi.cs b/PlexRequests.Api/PlexApi.cs
index c8d66b744..9fc190e6b 100644
--- a/PlexRequests.Api/PlexApi.cs
+++ b/PlexRequests.Api/PlexApi.cs
@@ -26,6 +26,7 @@
 #endregion
 using System;
 
+using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models;
 using PlexRequests.Helpers;
 
@@ -33,13 +34,13 @@ using RestSharp;
 
 namespace PlexRequests.Api
 {
-    public class PlexApi
+    public class PlexApi : IPlexApi
     {
         static PlexApi()
         {
             Version = AssemblyHelper.GetAssemblyVersion();
         }
-        private static string Version { get; set; }
+        private static string Version { get; }
 
         public PlexAuthentication SignIn(string username, string password)
         {
diff --git a/PlexRequests.Api/PlexRequests.Api.csproj b/PlexRequests.Api/PlexRequests.Api.csproj
index 0190d6ff8..e9b578476 100644
--- a/PlexRequests.Api/PlexRequests.Api.csproj
+++ b/PlexRequests.Api/PlexRequests.Api.csproj
@@ -67,16 +67,6 @@
   <ItemGroup>
     <Compile Include="ApiRequest.cs" />
     <Compile Include="CouchPotatoApi.cs" />
-    <Compile Include="Models\Movie\CouchPotatoAdd.cs" />
-    <Compile Include="Models\PlexAuthentication.cs" />
-    <Compile Include="Models\PlexError.cs" />
-    <Compile Include="Models\PlexFriends.cs" />
-    <Compile Include="Models\PlexSearch.cs" />
-    <Compile Include="Models\PlexUserRequest.cs" />
-    <Compile Include="Models\Tv\Authentication.cs" />
-    <Compile Include="Models\Tv\TvSearchResult.cs" />
-    <Compile Include="Models\Tv\TvShow.cs" />
-    <Compile Include="Models\Tv\TvShowImages.cs" />
     <Compile Include="MovieBase.cs" />
     <Compile Include="PlexApi.cs" />
     <Compile Include="TheMovieDbApi.cs" />
@@ -93,6 +83,10 @@
       <Project>{95834072-A675-415D-AA8F-877C91623810}</Project>
       <Name>PlexRequests.Api.Interfaces</Name>
     </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+      <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
+      <Name>PlexRequests.Api.Models</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PlexRequests.Helpers\PlexRequests.Helpers.csproj">
       <Project>{1252336D-42A3-482A-804C-836E60173DFA}</Project>
       <Name>PlexRequests.Helpers</Name>
diff --git a/PlexRequests.Services/AvailabilityUpdateService.cs b/PlexRequests.Services/AvailabilityUpdateService.cs
index a0fbee580..1a7d01d16 100644
--- a/PlexRequests.Services/AvailabilityUpdateService.cs
+++ b/PlexRequests.Services/AvailabilityUpdateService.cs
@@ -36,7 +36,6 @@ using Mono.Data.Sqlite;
 
 using NLog;
 
-using PlexRequests.Api.Models;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
diff --git a/PlexRequests.Services/PlexRequests.Services.csproj b/PlexRequests.Services/PlexRequests.Services.csproj
index 163fbc612..0d96051ad 100644
--- a/PlexRequests.Services/PlexRequests.Services.csproj
+++ b/PlexRequests.Services/PlexRequests.Services.csproj
@@ -85,6 +85,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+      <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
+      <Name>PlexRequests.Api.Models</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PlexRequests.Api\PlexRequests.Api.csproj">
       <Project>{8cb8d235-2674-442d-9c6a-35fcaeeb160d}</Project>
       <Name>PlexRequests.Api</Name>
diff --git a/PlexRequests.UI.Tests/BootstrapperExtensions.cs b/PlexRequests.UI.Tests/BootstrapperExtensions.cs
new file mode 100644
index 000000000..52e656311
--- /dev/null
+++ b/PlexRequests.UI.Tests/BootstrapperExtensions.cs
@@ -0,0 +1,45 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: BootstrapperExtensions.cs
+//    Created By: Jamie Rees
+//   
+//    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.
+//  ************************************************************************/
+#endregion
+using System.Collections.Generic;
+
+using Nancy.Bootstrapper;
+using Nancy.Session;
+
+namespace PlexRequests.UI.Tests
+{
+    public static class BootstrapperExtensions
+    {
+        public static void WithSession(this IPipelines pipeline, IDictionary<string, object> session)
+        {
+            pipeline.BeforeRequest.AddItemToEndOfPipeline(ctx =>
+            {
+                ctx.Request.Session = new Session(session);
+                return null;
+            });
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj b/PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj
index c4f41f81a..07171162c 100644
--- a/PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj
+++ b/PlexRequests.UI.Tests/PlexRequests.UI.Tests.csproj
@@ -17,6 +17,8 @@
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,6 +38,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="CsQuery, Version=1.3.3.5, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\CsQuery.1.3.3\lib\net40\CsQuery.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="FluentScheduler, Version=3.1.46.0, Culture=neutral, PublicKeyToken=b76503528a14ebd1, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentScheduler.3.1.46\lib\net40\FluentScheduler.dll</HintPath>
       <Private>True</Private>
@@ -44,6 +50,22 @@
       <HintPath>..\packages\Moq.4.2.1510.2205\lib\net40\Moq.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Nancy, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.1.4.3\lib\net40\Nancy.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nancy.Testing, Version=1.4.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.Testing.1.4.1\lib\net40\Nancy.Testing.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Nancy.ViewEngines.Razor, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Nancy.Viewengines.Razor.1.4.3\lib\net40\Nancy.ViewEngines.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.0.5813.39031, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.0.1\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
@@ -54,6 +76,10 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.2.0.30506.0\lib\net40\System.Web.Razor.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -64,13 +90,24 @@
     <Otherwise />
   </Choose>
   <ItemGroup>
+    <Compile Include="BootstrapperExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestRootPathProvider.cs" />
+    <Compile Include="UserLoginModuleTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\PlexRequests.Api.Interfaces\PlexRequests.Api.Interfaces.csproj">
+      <Project>{95834072-A675-415D-AA8F-877C91623810}</Project>
+      <Name>PlexRequests.Api.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Core\PlexRequests.Core.csproj">
+      <Project>{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}</Project>
+      <Name>PlexRequests.Core</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PlexRequests.Services\PlexRequests.Services.csproj">
       <Project>{566EFA49-68F8-4716-9693-A6B3F2624DEA}</Project>
       <Name>PlexRequests.Services</Name>
@@ -100,6 +137,13 @@
   </Choose>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Nancy.Viewengines.Razor.1.4.3\build\Nancy.ViewEngines.Razor.targets" Condition="Exists('..\packages\Nancy.Viewengines.Razor.1.4.3\build\Nancy.ViewEngines.Razor.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Nancy.Viewengines.Razor.1.4.3\build\Nancy.ViewEngines.Razor.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nancy.Viewengines.Razor.1.4.3\build\Nancy.ViewEngines.Razor.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/PlexRequests.UI.Tests/TestRootPathProvider.cs b/PlexRequests.UI.Tests/TestRootPathProvider.cs
new file mode 100644
index 000000000..4f7063f41
--- /dev/null
+++ b/PlexRequests.UI.Tests/TestRootPathProvider.cs
@@ -0,0 +1,69 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: TestRootPathProvider.cs
+//    Created By: Jamie Rees
+//   
+//    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.
+//  ************************************************************************/
+#endregion
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+using Nancy;
+
+using PlexRequests.UI.Modules;
+
+namespace PlexRequests.UI.Tests
+{
+    public class TestRootPathProvider : IRootPathProvider
+    {
+        private static string _CachedRootPath;
+
+        public string GetRootPath()
+        {
+            //return @"C:\Applications\51\DeliveryDateCalculator\StandAndDeliver\Views\Home\";
+            if (!string.IsNullOrEmpty(_CachedRootPath))
+                return _CachedRootPath;
+
+            var currentDirectory = new DirectoryInfo(Environment.CurrentDirectory);
+
+            bool rootPathFound = false;
+            while (!rootPathFound)
+            {
+                var directoriesContainingViewFolder = currentDirectory.GetDirectories(
+                          "Views", SearchOption.AllDirectories);
+                if (directoriesContainingViewFolder.Any())
+                {
+                    _CachedRootPath = directoriesContainingViewFolder.First().FullName;
+                    rootPathFound = true;
+                }
+
+                currentDirectory = currentDirectory.Parent;
+            }
+
+            return _CachedRootPath;
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/PlexRequests.UI.Tests/UserLoginModuleTests.cs b/PlexRequests.UI.Tests/UserLoginModuleTests.cs
new file mode 100644
index 000000000..3cab03fc2
--- /dev/null
+++ b/PlexRequests.UI.Tests/UserLoginModuleTests.cs
@@ -0,0 +1,93 @@
+#region Copyright
+// /************************************************************************
+//    Copyright (c) 2016 Jamie Rees
+//    File: UserLoginModuleTests.cs
+//    Created By: Jamie Rees
+//   
+//    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.
+//  ************************************************************************/
+#endregion
+using System.Collections.Generic;
+
+using Moq;
+
+using Nancy;
+using Nancy.Testing;
+
+using Newtonsoft.Json;
+
+using NUnit.Framework;
+
+using PlexRequests.Api.Interfaces;
+using PlexRequests.Core;
+using PlexRequests.Core.SettingModels;
+using PlexRequests.UI.Models;
+using PlexRequests.UI.Modules;
+
+namespace PlexRequests.UI.Tests
+{
+    [TestFixture]
+    public class UserLoginModuleTests
+    {
+        private Mock<ISettingsService<AuthenticationSettings>> AuthMock { get; set; }
+        private Mock<IPlexApi> PlexMock { get; set; }
+
+        [SetUp]
+        public void Setup()
+        {
+            AuthMock = new Mock<ISettingsService<AuthenticationSettings>>();
+            PlexMock = new Mock<IPlexApi>();
+        }
+
+        [Test]
+        public void LoginWithoutAuthentication()
+        {
+            var expectedSettings = new AuthenticationSettings { UserAuthentication = false, PlexAuthToken = "abc" };
+            AuthMock.Setup(x => x.GetSettings()).Returns(expectedSettings);
+
+            var bootstrapper = new ConfigurableBootstrapper(with =>
+            {
+                with.Module<UserLoginModule>();
+                with.Dependency(AuthMock.Object);
+                with.Dependency(PlexMock.Object);
+                with.RootPathProvider<TestRootPathProvider>();
+            });
+
+            bootstrapper.WithSession(new Dictionary<string, object>());
+
+            var browser = new Browser(bootstrapper);
+            // When
+            var result = browser.Post("/userlogin", with =>
+            {
+                with.HttpRequest();
+                with.Header("Accept", "application/json");
+                with.FormValue("Username", "abc");
+            });
+
+            // Then
+            Assert.That(HttpStatusCode.OK, Is.EqualTo(result.StatusCode));
+            Assert.That(result.Context.Request.Session[SessionKeys.UsernameKey], Is.EqualTo("abc"));
+
+            var body = JsonConvert.DeserializeObject<JsonResponseModel>(result.Body.AsString());
+            Assert.That(body.Result, Is.EqualTo(true));
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/PlexRequests.UI.Tests/app.config b/PlexRequests.UI.Tests/app.config
index ac2586ac9..d1c064e34 100644
--- a/PlexRequests.UI.Tests/app.config
+++ b/PlexRequests.UI.Tests/app.config
@@ -1,11 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.1.0" newVersion="3.0.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<appSettings>
+    <add key="webPages:Enabled" value="false" />
+  </appSettings><system.web.webPages.razor>
+    <pages pageBaseType="Nancy.ViewEngines.Razor.NancyRazorViewBase">
+      <namespaces>
+        <add namespace="Nancy.ViewEngines.Razor" />
+      </namespaces>
+    </pages>
+  </system.web.webPages.razor></configuration>
\ No newline at end of file
diff --git a/PlexRequests.UI.Tests/packages.config b/PlexRequests.UI.Tests/packages.config
index 469cafc98..5754a6f48 100644
--- a/PlexRequests.UI.Tests/packages.config
+++ b/PlexRequests.UI.Tests/packages.config
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoFixture" version="3.40.0" targetFramework="net452" />
+  <package id="CsQuery" version="1.3.3" targetFramework="net46" />
   <package id="FluentScheduler" version="3.1.46" targetFramework="net46" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.30506.0" targetFramework="net46" />
   <package id="Moq" version="4.2.1510.2205" targetFramework="net452" />
+  <package id="Nancy" version="1.4.3" targetFramework="net46" />
+  <package id="Nancy.Testing" version="1.4.1" targetFramework="net46" />
+  <package id="Nancy.Viewengines.Razor" version="1.4.3" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net46" />
   <package id="NUnit" version="3.0.1" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/PlexRequests.UI/Bootstrapper.cs b/PlexRequests.UI/Bootstrapper.cs
index fda7a5a27..f27f9a0ac 100644
--- a/PlexRequests.UI/Bootstrapper.cs
+++ b/PlexRequests.UI/Bootstrapper.cs
@@ -36,6 +36,8 @@ using Nancy.Diagnostics;
 using Nancy.Session;
 using Nancy.TinyIoc;
 
+using PlexRequests.Api;
+using PlexRequests.Api.Interfaces;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
 using PlexRequests.Helpers;
@@ -73,6 +75,9 @@ namespace PlexRequests.UI
             container.Register<IAvailabilityChecker, PlexAvailabilityChecker>();
             container.Register<IConfigurationReader, ConfigurationReader>();
             container.Register<IIntervals, UpdateInterval>();
+
+
+            container.Register<IPlexApi, PlexApi>();
             base.ConfigureRequestContainer(container, context);
         }
 
diff --git a/PlexRequests.UI/Modules/UserLoginModule.cs b/PlexRequests.UI/Modules/UserLoginModule.cs
index cdc659d47..f932a1aac 100644
--- a/PlexRequests.UI/Modules/UserLoginModule.cs
+++ b/PlexRequests.UI/Modules/UserLoginModule.cs
@@ -29,7 +29,7 @@ using System.Linq;
 using Nancy;
 using Nancy.Responses.Negotiation;
 
-using PlexRequests.Api;
+using PlexRequests.Api.Interfaces;
 using PlexRequests.Api.Models;
 using PlexRequests.Core;
 using PlexRequests.Core.SettingModels;
@@ -40,24 +40,27 @@ namespace PlexRequests.UI.Modules
     // TODO: Add ability to logout
     public class UserLoginModule : NancyModule
     {
-        public UserLoginModule(ISettingsService<AuthenticationSettings> auth) : base("userlogin")
+        public UserLoginModule(ISettingsService<AuthenticationSettings> auth, IPlexApi api) : base("userlogin")
         {
             AuthService = auth;
+            Api = api;
             Get["/"] = _ => Index();
             Post["/"] = x => LoginUser();
         }
 
+        private ISettingsService<AuthenticationSettings> AuthService { get; set; }
+        private IPlexApi Api { get; set; }
+
         public Negotiator Index()
         {
             var settings = AuthService.GetSettings();
             return View["Index", settings];
         }
-        private ISettingsService<AuthenticationSettings> AuthService { get; set; }
 
         private Response LoginUser()
         {
             var authenticated = false;
-            var api = new PlexApi();
+
             var settings = AuthService.GetSettings();
             var username = Request.Form.username.Value;
             var password = string.Empty;
@@ -69,7 +72,7 @@ namespace PlexRequests.UI.Modules
             
             if (settings.UserAuthentication && settings.UsePassword) // Authenticate with Plex
             {
-                var signedIn = (PlexAuthentication)api.SignIn(username, password);
+                var signedIn = (PlexAuthentication)Api.SignIn(username, password);
                 if (signedIn.user?.authentication_token != null)
                 {
                     authenticated = CheckIfUserIsInPlexFriends(username, settings.PlexAuthToken);
@@ -95,8 +98,7 @@ namespace PlexRequests.UI.Modules
 
         private bool CheckIfUserIsInPlexFriends(string username, string authToken)
         {
-            var api = new PlexApi();
-            var users = api.GetUsers(authToken);
+            var users = Api.GetUsers(authToken);
             return users.User.Any(x => x.Username == username);
         }
     }
diff --git a/PlexRequests.UI/PlexRequests.UI.csproj b/PlexRequests.UI/PlexRequests.UI.csproj
index bb17347c4..2b4d233eb 100644
--- a/PlexRequests.UI/PlexRequests.UI.csproj
+++ b/PlexRequests.UI/PlexRequests.UI.csproj
@@ -282,6 +282,14 @@
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>
+    <ProjectReference Include="..\PlexRequests.Api.Interfaces\PlexRequests.Api.Interfaces.csproj">
+      <Project>{95834072-A675-415D-AA8F-877C91623810}</Project>
+      <Name>PlexRequests.Api.Interfaces</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\PlexRequests.Api.Models\PlexRequests.Api.Models.csproj">
+      <Project>{CB37A5F8-6DFC-4554-99D3-A42B502E4591}</Project>
+      <Name>PlexRequests.Api.Models</Name>
+    </ProjectReference>
     <ProjectReference Include="..\PlexRequests.Api\PlexRequests.Api.csproj">
       <Project>{8cb8d235-2674-442d-9c6a-35fcaeeb160d}</Project>
       <Name>PlexRequests.Api</Name>
diff --git a/PlexRequests.UI/Views/_ViewStart.cshtml b/PlexRequests.UI/Views/_ViewStart.cshtml
index eceb941e7..43e595698 100644
--- a/PlexRequests.UI/Views/_ViewStart.cshtml
+++ b/PlexRequests.UI/Views/_ViewStart.cshtml
@@ -1,3 +1,3 @@
 @{
-    Layout = "Views/Shared/_Layout.cshtml";
+    Layout = "Shared/_Layout.cshtml";
 }
\ No newline at end of file
diff --git a/PlexRequests.sln b/PlexRequests.sln
index 4a2431cb7..8bd25df43 100644
--- a/PlexRequests.sln
+++ b/PlexRequests.sln
@@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Core.Tests", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Services", "PlexRequests.Services\PlexRequests.Services.csproj", "{566EFA49-68F8-4716-9693-A6B3F2624DEA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexRequests.Api.Models", "PlexRequests.Api.Models\PlexRequests.Api.Models.csproj", "{CB37A5F8-6DFC-4554-99D3-A42B502E4591}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,10 @@ Global
 		{566EFA49-68F8-4716-9693-A6B3F2624DEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{566EFA49-68F8-4716-9693-A6B3F2624DEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{566EFA49-68F8-4716-9693-A6B3F2624DEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB37A5F8-6DFC-4554-99D3-A42B502E4591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB37A5F8-6DFC-4554-99D3-A42B502E4591}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB37A5F8-6DFC-4554-99D3-A42B502E4591}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB37A5F8-6DFC-4554-99D3-A42B502E4591}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE