diff --git a/.gitignore b/.gitignore
index 223a26d19..2d1da653a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,19 +124,15 @@ _TeamCity*
 config.xml
 nzbdrone.log*txt
 UpdateLogs/
-*/Bootstrap/*.css
-*//Bootstrap/*.css
-*.eq
 */.idea/workspace.xml
 *workspace.xml
 *.test-cache
-*.sqo
 *.userprefs
 */test-results/*
 .idea/*
 NzbDrone.Web/*
 *log.txt
-siaqodb.lic
 node_modules/
+UpgradeLog*.htm
 NzbDrone.Backbone/templates.js
 NzbDrone.Backbone/Content/bootstrap.css
diff --git a/Libraries/Sqlite/Mono.Data.Sqlite.dll b/Libraries/Sqlite/Mono.Data.Sqlite.dll
deleted file mode 100644
index dad79f065..000000000
Binary files a/Libraries/Sqlite/Mono.Data.Sqlite.dll and /dev/null differ
diff --git a/Libraries/Sqlite/x86/SQLite.Interop.dll b/Libraries/Sqlite/x86/SQLite.Interop.dll
new file mode 100644
index 000000000..1838fba8d
Binary files /dev/null and b/Libraries/Sqlite/x86/SQLite.Interop.dll differ
diff --git a/Libraries/Sqlite/x86/sqlite3.dll b/Libraries/Sqlite/x86/sqlite3.dll
deleted file mode 100644
index 45b2e4eb3..000000000
Binary files a/Libraries/Sqlite/x86/sqlite3.dll and /dev/null differ
diff --git a/NzbDrone.App.Test/NzbDrone.App.Test.csproj b/NzbDrone.App.Test/NzbDrone.App.Test.csproj
index de485a7a0..6424323fc 100644
--- a/NzbDrone.App.Test/NzbDrone.App.Test.csproj
+++ b/NzbDrone.App.Test/NzbDrone.App.Test.csproj
@@ -60,9 +60,9 @@
     <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
diff --git a/NzbDrone.App.Test/packages.config b/NzbDrone.App.Test/packages.config
index bd67fdc24..8bf830567 100644
--- a/NzbDrone.App.Test/packages.config
+++ b/NzbDrone.App.Test/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.0.1" targetFramework="net40" />
-  <package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
+  <package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" />
   <package id="NLog" version="2.0.0.2000" />
diff --git a/NzbDrone.Backbone/.idea/scopes/scope_settings.xml b/NzbDrone.Backbone/.idea/scopes/scope_settings.xml
new file mode 100644
index 000000000..922003b84
--- /dev/null
+++ b/NzbDrone.Backbone/.idea/scopes/scope_settings.xml
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+  <state>
+    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj b/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
index ca81e25e4..f7311fbe2 100644
--- a/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
+++ b/NzbDrone.Common.Test/NzbDrone.Common.Test.csproj
@@ -61,9 +61,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Autofac.3.0.1\lib\net40\Autofac.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
diff --git a/NzbDrone.Common.Test/packages.config b/NzbDrone.Common.Test/packages.config
index c0539435e..4d5465ff2 100644
--- a/NzbDrone.Common.Test/packages.config
+++ b/NzbDrone.Common.Test/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.0.1" targetFramework="net40" />
-  <package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
+  <package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NLog" version="2.0.0.2000" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
diff --git a/NzbDrone.Console/NzbDrone.Console.csproj b/NzbDrone.Console/NzbDrone.Console.csproj
index 9662296c6..c50ec4f3c 100644
--- a/NzbDrone.Console/NzbDrone.Console.csproj
+++ b/NzbDrone.Console/NzbDrone.Console.csproj
@@ -124,7 +124,7 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\x86\*.*"   "$(TargetDir)"</PostBuildEvent>
+    <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*"   "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/NzbDrone.Core.Test/Datastore/DatabaseJoinFixture.cs b/NzbDrone.Core.Test/Datastore/DatabaseJoinFixture.cs
new file mode 100644
index 000000000..84d93e6a3
--- /dev/null
+++ b/NzbDrone.Core.Test/Datastore/DatabaseJoinFixture.cs
@@ -0,0 +1,97 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Datastore;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.Datastore
+{
+    [TestFixture]
+    public class DatabaseJoinFixture : DbTest<BasicRepository<Series>, Series>
+    {
+        [Test]
+        [Explicit]
+        public void benchmark()
+        {
+            var series = Builder<Series>.CreateNew()
+                                        .With(c => c.Id = 0)
+                                        .Build();
+
+            Marr.Data.MapRepository.Instance.EnableTraceLogging = false;
+
+            Subject.Insert(series);
+
+            var covers = Builder<MediaCover.MediaCover>.CreateListOfSize(5)
+                .All()
+                .With(c => c.SeriesId = series.Id)
+                .With(c => c.Id = 0)
+                .Build()
+                .ToList();
+
+            Db.InsertMany(covers);
+
+            var loadedSeries = Subject.SingleOrDefault();
+
+            var sw = Stopwatch.StartNew();
+            for (int i = 0; i < 10000; i++)
+            {
+                loadedSeries = Subject.SingleOrDefault();
+                var list = loadedSeries.Covers.Value;
+            }
+
+            sw.Stop();
+
+            Console.WriteLine(sw.Elapsed);
+
+            loadedSeries.Covers.Value.Should().HaveSameCount(covers);
+        }
+
+        [Test]
+        public void one_to_many()
+        {
+            var series = Builder<Series>.CreateNew()
+                                        .With(c => c.Id = 0)
+                                        .Build();
+
+            Subject.Insert(series);
+
+            var covers = Builder<MediaCover.MediaCover>.CreateListOfSize(5)
+                .All()
+                .With(c => c.SeriesId = series.Id)
+                .With(c => c.Id = 0)
+                .Build()
+                .ToList();
+
+            Db.InsertMany(covers);
+
+            var loadedSeries = Subject.SingleOrDefault();
+            loadedSeries = Subject.SingleOrDefault();
+
+            loadedSeries.Covers.Value.Should().HaveSameCount(covers);
+        }
+
+        [Test]
+        public void embeded_document_as_json()
+        {
+            var episode = Builder<Episode>.CreateNew()
+                                                       .With(c => c.Id = 0)
+                                                       .Build();
+
+            Db.Insert(episode);
+
+
+            var history = Builder<History.History>.CreateNew()
+                            .With(c => c.Id = 0)
+                            .With(c => c.EpisodeId = episode.Id)
+                            .With(c => c.Quality = new QualityModel())
+                            .Build();
+
+            Db.Insert(history);
+            Db.Single<History.History>().Episode.Value.Should().NotBeNull();
+        }
+    }
+}
diff --git a/NzbDrone.Core.Test/Framework/DbTest.cs b/NzbDrone.Core.Test/Framework/DbTest.cs
index 7b3001fb9..382aa01aa 100644
--- a/NzbDrone.Core.Test/Framework/DbTest.cs
+++ b/NzbDrone.Core.Test/Framework/DbTest.cs
@@ -124,6 +124,7 @@ namespace NzbDrone.Core.Test.Framework
         void InsertMany<T>(IEnumerable<T> items) where T : ModelBase, new();
         void Insert<T>(T item) where T : ModelBase, new();
         IEnumerable<T> All<T>() where T : ModelBase, new();
+        T Single<T>() where T : ModelBase, new();
         void Update<T>(T childModel) where T : ModelBase, new();
         void Delete<T>(T childModel) where T : ModelBase, new();
     }
@@ -152,6 +153,11 @@ namespace NzbDrone.Core.Test.Framework
             return new BasicRepository<T>(_dbConnection).All();
         }
 
+        public T Single<T>() where T : ModelBase, new()
+        {
+            return All<T>().SingleOrDefault();
+        }
+
         public void Update<T>(T childModel) where T : ModelBase, new()
         {
             new BasicRepository<T>(_dbConnection).Update(childModel);
diff --git a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
index 6321ce1d0..6488f2e71 100644
--- a/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
+++ b/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj
@@ -73,12 +73,13 @@
     <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Marr.Data">
       <HintPath>..\packages\MarrDataMapper.3.17.4747.34302\lib\Marr.Data.dll</HintPath>
+    </Reference>
     <Reference Include="FluentMigrator">
       <HintPath>..\packages\FluentMigrator.1.0.6.0\lib\40\FluentMigrator.dll</HintPath>
     </Reference>
@@ -128,6 +129,13 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.Entity" />
+    <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SQLite.Linq">
+      <HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
+    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
@@ -136,6 +144,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Datastore\BasicRepositoryFixture.cs" />
+    <Compile Include="Datastore\DatabaseJoinFixture.cs" />
     <Compile Include="Datastore\ObjectDatabaseFixture.cs" />
     <Compile Include="Framework\CoreTest.cs" />
     <Compile Include="Framework\DbTest.cs" />
@@ -404,7 +413,7 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\x86\*.*"   "$(TargetDir)"</PostBuildEvent>
+    <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*"   "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
index 8d93dcdc6..da00aecf2 100644
--- a/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
+++ b/NzbDrone.Core.Test/ProviderTests/TvRageMappingProviderTests/FindMatchingTvRageSeriesFixture.cs
@@ -51,7 +51,7 @@ namespace NzbDrone.Core.Test.ProviderTests.TvRageMappingProviderTests
                   .Setup(s => s.GetEpisode(_series.Id, 1, 1))
                   .Returns(_episode);
 
-            Mocker.GetMock<SceneMappingService>()
+            Mocker.GetMock<ISceneMappingService>()
                   .Setup(s => s.GetCleanName(_series.Id))
                   .Returns("");
 
diff --git a/NzbDrone.Core.Test/packages.config b/NzbDrone.Core.Test/packages.config
index 3f1b7b323..3128343f3 100644
--- a/NzbDrone.Core.Test/packages.config
+++ b/NzbDrone.Core.Test/packages.config
@@ -3,7 +3,7 @@
   <package id="Autofac" version="3.0.1" targetFramework="net40" />
   <package id="AutoMoq" version="1.6.1" targetFramework="net40" />
   <package id="CommonServiceLocator" version="1.0" targetFramework="net40" />
-  <package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
+  <package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
   <package id="FluentMigrator" version="1.0.6.0" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" />
@@ -13,5 +13,6 @@
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
   <package id="Prowlin" version="0.9.4456.26422" targetFramework="net40" />
   <package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
+  <package id="System.Data.SQLite" version="1.0.84.0" targetFramework="net40" />
   <package id="Unity" version="2.1.505.2" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs b/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs
new file mode 100644
index 000000000..4e72af814
--- /dev/null
+++ b/NzbDrone.Core/Datastore/Converters/EmbeddedDocumentConverter.cs
@@ -0,0 +1,48 @@
+using System;
+using Marr.Data.Converters;
+using Marr.Data.Mapping;
+using Newtonsoft.Json;
+
+namespace NzbDrone.Core.Datastore.Converters
+{
+    public class EmbeddedDocumentConverter : IConverter
+    {
+        public object FromDB(ColumnMap map, object dbValue)
+        {
+            if (dbValue == DBNull.Value)
+            {
+                return DBNull.Value;
+            }
+
+            var stringValue = (string)dbValue;
+
+            if (string.IsNullOrWhiteSpace(stringValue))
+            {
+                return null;
+            }
+
+            return JsonConvert.DeserializeObject(stringValue, map.FieldType);
+        }
+
+        public object ToDB(object clrValue)
+        {
+            if (clrValue == null) return null;
+
+            if (clrValue as IEmbeddedDocument == null)
+            {
+                throw new InvalidOperationException("Attempted to embedded an object not marked with IEmbeddedDocument");
+            }
+
+            var json = JsonConvert.SerializeObject(clrValue);
+            return json;
+        }
+
+        public Type DbType
+        {
+            get
+            {
+                return typeof(string);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/DbFactory.cs b/NzbDrone.Core/Datastore/DbFactory.cs
index 1de2122d3..256a4ad1a 100644
--- a/NzbDrone.Core/Datastore/DbFactory.cs
+++ b/NzbDrone.Core/Datastore/DbFactory.cs
@@ -1,6 +1,7 @@
 using System;
+using System.Data;
+using System.Data.SQLite;
 using Marr.Data;
-using Mono.Data.Sqlite;
 using NzbDrone.Core.Datastore.Migration.Framework;
 
 
@@ -26,7 +27,7 @@ namespace NzbDrone.Core.Datastore
             var connectionString = GetConnectionString(dbPath);
 
             _migrationController.MigrateToLatest(connectionString, migrationType);
-            var dataMapper = new DataMapper(SqliteFactory.Instance, connectionString)
+            var dataMapper = new DataMapper(SQLiteFactory.Instance, connectionString)
                 {
                     SqlMode = SqlModes.Text,
                 };
diff --git a/NzbDrone.Core/Datastore/EnumIntConverter.cs b/NzbDrone.Core/Datastore/EnumIntConverter.cs
new file mode 100644
index 000000000..7765fe0e0
--- /dev/null
+++ b/NzbDrone.Core/Datastore/EnumIntConverter.cs
@@ -0,0 +1,37 @@
+using System;
+using Marr.Data.Converters;
+using Marr.Data.Mapping;
+
+namespace NzbDrone.Core.Datastore
+{
+    public class EnumIntConverter : IConverter
+    {
+        public Type DbType
+        {
+            get
+            {
+                return typeof(int);
+            }
+        }
+
+        public object FromDB(ColumnMap map, object dbValue)
+        {
+            if (dbValue != null && dbValue != DBNull.Value)
+            {
+                return Enum.ToObject(map.FieldType, (Int64)dbValue);
+            }
+
+            return null;
+        }
+
+        public object ToDB(object clrValue)
+        {
+            if (clrValue != null)
+            {
+                return (int)clrValue;
+            }
+
+            return DBNull.Value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/IEmbeddedDocument.cs b/NzbDrone.Core/Datastore/IEmbeddedDocument.cs
new file mode 100644
index 000000000..14a1587b7
--- /dev/null
+++ b/NzbDrone.Core/Datastore/IEmbeddedDocument.cs
@@ -0,0 +1,6 @@
+namespace NzbDrone.Core.Datastore
+{
+    public interface IEmbeddedDocument
+    {
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/LazyList.cs b/NzbDrone.Core/Datastore/LazyList.cs
new file mode 100644
index 000000000..6f4f3fe22
--- /dev/null
+++ b/NzbDrone.Core/Datastore/LazyList.cs
@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Marr.Data;
+
+namespace NzbDrone.Core.Datastore
+{
+    public class LazyList<T> : LazyLoaded<List<T>>
+    {
+
+    }
+}
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs b/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs
index 396ad47d1..83b3c7b5d 100644
--- a/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs
+++ b/NzbDrone.Core/Datastore/Migration/Framework/MigrationController.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using FluentMigrator.Runner;
 using FluentMigrator.Runner.Initialization;
-using NzbDrone.Core.Datastore.Migration.Sqlite;
+using FluentMigrator.Runner.Processors.Sqlite;
 
 namespace NzbDrone.Core.Datastore.Migration.Framework
 {
@@ -30,7 +30,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
             };
 
             var options = new MigrationOptions { PreviewOnly = false, Timeout = 60 };
-            var factory = new MonoSqliteProcessorFactory();
+            var factory = new SqliteProcessorFactory();
             var processor = factory.Create(connectionString, _announcer, options);
             var runner = new MigrationRunner(assembly, migrationContext, processor);
             runner.MigrateUp(true);
diff --git a/NzbDrone.Core/Datastore/Migration/Migration20130324.cs b/NzbDrone.Core/Datastore/Migration/Migration20130324.cs
index 504428e3c..9feac7e0d 100644
--- a/NzbDrone.Core/Datastore/Migration/Migration20130324.cs
+++ b/NzbDrone.Core/Datastore/Migration/Migration20130324.cs
@@ -1,5 +1,5 @@
 using FluentMigrator;
-using  NzbDrone.Core.Datastore.Migration.Framework;
+using NzbDrone.Core.Datastore.Migration.Framework;
 
 namespace NzbDrone.Core.Datastore.Migration
 {
@@ -28,7 +28,7 @@ namespace NzbDrone.Core.Datastore.Migration
 
             Create.Table("Episodes")
                   .WithColumn("Id").AsInt32().PrimaryKey().Identity()
-                  .WithColumn("TvdbId").AsInt32().Nullable()
+                  .WithColumn("TvDbEpisodeId").AsInt32().Nullable()
                   .WithColumn("SeriesId").AsInt32().NotNullable()
                   .WithColumn("SeasonNumber").AsInt32().NotNullable()
                   .WithColumn("EpisodeNumber").AsInt32().NotNullable()
@@ -56,8 +56,7 @@ namespace NzbDrone.Core.Datastore.Migration
                   .WithColumn("SeriesId").AsInt32().NotNullable()
                   .WithColumn("NzbTitle").AsString().NotNullable()
                   .WithColumn("Date").AsDateTime().NotNullable()
-                  .WithColumn("Quality").AsInt32().NotNullable()
-                  .WithColumn("Proper").AsBoolean().NotNullable()
+                  .WithColumn("Quality").AsString().NotNullable()
                   .WithColumn("Indexer").AsString().NotNullable()
                   .WithColumn("NzbInfoUrl").AsString().Nullable()
                   .WithColumn("ReleaseGroup").AsString().Nullable();
@@ -131,7 +130,6 @@ namespace NzbDrone.Core.Datastore.Migration
                   .WithColumn("LastInfoSync").AsDateTime().Nullable()
                   .WithColumn("LastDiskSync").AsDateTime().Nullable()
                   .WithColumn("Runtime").AsInt32().NotNullable()
-                  .WithColumn("BannerUrl").AsString().NotNullable()
                   .WithColumn("SeriesType").AsInt32().NotNullable()
                   .WithColumn("BacklogSetting").AsInt32().NotNullable()
                   .WithColumn("Network").AsString().NotNullable()
@@ -140,7 +138,14 @@ namespace NzbDrone.Core.Datastore.Migration
                   .WithColumn("TvRageId").AsInt32().Nullable()
                   .WithColumn("TvRageTitle").AsString().NotNullable()
                   .WithColumn("UtcOffSet").AsInt32().NotNullable()
-                  .WithColumn("FirstAired").AsDateTime().Nullable();
+                  .WithColumn("FirstAired").AsDateTime().Nullable()
+                  .WithColumn("NextAiring").AsDateTime().Nullable();
+
+            Create.Table("MediaCovers")
+                  .WithColumn("Id").AsInt32().PrimaryKey().Identity()
+                  .WithColumn("SeriesId").AsInt32().NotNullable()
+                  .WithColumn("Url").AsString().NotNullable()
+                  .WithColumn("CoverType").AsInt32().NotNullable();
         }
 
         protected override void LogDbUpgrade()
diff --git a/NzbDrone.Core/Datastore/Migration/Sqlite/MonoSqliteDbFactory.cs b/NzbDrone.Core/Datastore/Migration/Sqlite/MonoSqliteDbFactory.cs
deleted file mode 100644
index 9fe5d2234..000000000
--- a/NzbDrone.Core/Datastore/Migration/Sqlite/MonoSqliteDbFactory.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using FluentMigrator.Runner.Processors;
-
-namespace NzbDrone.Core.Datastore.Migration.Sqlite
-{
-    public class MonoSqliteDbFactory : ReflectionBasedDbFactory
-    {
-        public MonoSqliteDbFactory()
-            : base("Mono.Data.Sqlite", "Mono.Data.Sqlite.SqliteFactory")
-        {
-        }
-
-    
-    }
-}
diff --git a/NzbDrone.Core/Datastore/Migration/Sqlite/MonoSqliteProcessorFactory.cs b/NzbDrone.Core/Datastore/Migration/Sqlite/MonoSqliteProcessorFactory.cs
deleted file mode 100644
index dd8e3740f..000000000
--- a/NzbDrone.Core/Datastore/Migration/Sqlite/MonoSqliteProcessorFactory.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using FluentMigrator;
-using FluentMigrator.Runner;
-using FluentMigrator.Runner.Generators.SQLite;
-using FluentMigrator.Runner.Processors;
-using FluentMigrator.Runner.Processors.Sqlite;
-
-namespace NzbDrone.Core.Datastore.Migration.Sqlite
-{
-    public class MonoSqliteProcessorFactory : MigrationProcessorFactory
-    {
-        public override IMigrationProcessor Create(string connectionString, IAnnouncer announcer, IMigrationProcessorOptions options)
-        {
-            var factory = new MonoSqliteDbFactory();
-            var connection = factory.CreateConnection(connectionString);
-            return new SqliteProcessor(connection, new SqliteGenerator(), announcer, options, factory);
-        }
-    }
-}
\ No newline at end of file
diff --git a/NzbDrone.Core/Datastore/TableMapping.cs b/NzbDrone.Core/Datastore/TableMapping.cs
index 071ae9854..c63ada9a8 100644
--- a/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/NzbDrone.Core/Datastore/TableMapping.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using Marr.Data;
 using Marr.Data.Mapping;
 using NzbDrone.Core.Configuration;
@@ -13,6 +14,7 @@ using NzbDrone.Core.ReferenceData;
 using NzbDrone.Core.RootFolders;
 using NzbDrone.Core.Tv;
 using BooleanIntConverter = NzbDrone.Core.Datastore.Converters.BooleanIntConverter;
+using System.Linq;
 
 namespace NzbDrone.Core.Datastore
 {
@@ -35,12 +37,21 @@ namespace NzbDrone.Core.Datastore
 
             Mapper.Entity<SceneMapping>().RegisterModel("SceneMappings");
 
-            Mapper.Entity<History.History>().RegisterModel("History");
+            Mapper.Entity<History.History>().RegisterModel("History")
+                .Relationships.AutoMapComplexTypeProperties<ILazyLoaded>()
+                .For(c => c.Episode)
+                .LazyLoad((db, history) => db.Query<Episode>().Where(ep => ep.Id == history.Id).ToList());
+
+            Mapper.Entity<Series>().RegisterModel("Series")
+                  .Relationships.AutoMapComplexTypeProperties<ILazyLoaded>()
+                  .For(c => c.Covers)
+                  .LazyLoad((db, series) => db.Query<MediaCover.MediaCover>().Where(cover => cover.SeriesId == series.Id).ToList());
+
 
-            Mapper.Entity<Series>().RegisterModel("Series");
             Mapper.Entity<Season>().RegisterModel("Seasons");
             Mapper.Entity<Episode>().RegisterModel("Episodes");
             Mapper.Entity<EpisodeFile>().RegisterModel("EpisodeFiles");
+            Mapper.Entity<MediaCover.MediaCover>().RegisterModel("MediaCovers");
 
             Mapper.Entity<QualityProfile>().RegisterModel("QualityProfiles");
             Mapper.Entity<QualitySize>().RegisterModel("QualitySizes");
@@ -53,19 +64,48 @@ namespace NzbDrone.Core.Datastore
         {
             MapRepository.Instance.RegisterTypeConverter(typeof(Int32), new Int32Converter());
             MapRepository.Instance.RegisterTypeConverter(typeof(Boolean), new BooleanIntConverter());
+            MapRepository.Instance.RegisterTypeConverter(typeof(Enum), new EnumIntConverter());
+            MapRepository.Instance.RegisterTypeConverter(typeof(QualityModel), new EmbeddedDocumentConverter());
         }
 
 
-        private static void RegisterModel<T>(this FluentMappings.MappingsFluentEntity<T> mapBuilder, string tableName) where T : ModelBase
+        private static ColumnMapBuilder<T> RegisterModel<T>(this FluentMappings.MappingsFluentEntity<T> mapBuilder, string tableName) where T : ModelBase
         {
-            mapBuilder.Table.MapTable(tableName)
-                      .Columns
-                      .AutoMapSimpleTypeProperties()
-                      .For(c => c.Id)
-                      .SetPrimaryKey()
-                      .SetReturnValue()
-                      .SetAutoIncrement();
+            return mapBuilder.Table.MapTable(tableName)
+                         .Columns
+                         .AutoMapPropertiesWhere(IsMappableProperty)
+                         .For(c => c.Id)
+                         .SetPrimaryKey()
+                         .SetReturnValue()
+                         .SetAutoIncrement();
         }
 
+        private static bool IsMappableProperty(MemberInfo memberInfo)
+        {
+            var propertyInfo = memberInfo as PropertyInfo;
+
+            if (propertyInfo == null) return false;
+
+            if (propertyInfo.PropertyType.GetInterfaces().Any(i => i == typeof(IEmbeddedDocument)))
+            {
+                return true;
+            }
+
+            return propertyInfo.CanRead && propertyInfo.CanWrite && IsSimpleType(propertyInfo.PropertyType);
+        }
+
+        private static bool IsSimpleType(Type type)
+        {
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                type = type.GetGenericArguments()[0];
+            }
+
+            return type.IsPrimitive
+                || type.IsEnum
+                || type == typeof(string)
+                || type == typeof(DateTime)
+                || type == typeof(Decimal);
+        }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/Download/Clients/BlackholeProvider.cs b/NzbDrone.Core/Download/Clients/BlackholeProvider.cs
index 340d7de07..3f358b5de 100644
--- a/NzbDrone.Core/Download/Clients/BlackholeProvider.cs
+++ b/NzbDrone.Core/Download/Clients/BlackholeProvider.cs
@@ -1,14 +1,10 @@
 using System;
 using System.IO;
-using System.Linq;
 using NLog;
 using NzbDrone.Common;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.DecisionEngine.Specifications;
-using NzbDrone.Core.History;
-using NzbDrone.Core.MediaFiles;
 using NzbDrone.Core.Model;
-using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Organizer;
 
 namespace NzbDrone.Core.Download.Clients
diff --git a/NzbDrone.Core/Download/Clients/PneumaticProvider.cs b/NzbDrone.Core/Download/Clients/PneumaticProvider.cs
index e2143a627..3bc797850 100644
--- a/NzbDrone.Core/Download/Clients/PneumaticProvider.cs
+++ b/NzbDrone.Core/Download/Clients/PneumaticProvider.cs
@@ -17,21 +17,15 @@ namespace NzbDrone.Core.Download.Clients
         private readonly IConfigService _configService;
         private readonly HttpProvider _httpProvider;
         private readonly DiskProvider _diskProvider;
-        private readonly UpgradeHistorySpecification _upgradeHistorySpecification;
 
         private static readonly Logger logger = LogManager.GetCurrentClassLogger();
 
         public PneumaticProvider(IConfigService configService, HttpProvider httpProvider,
-                                    DiskProvider diskProvider, UpgradeHistorySpecification upgradeHistorySpecification)
+                                    DiskProvider diskProvider)
         {
             _configService = configService;
             _httpProvider = httpProvider;
             _diskProvider = diskProvider;
-            _upgradeHistorySpecification = upgradeHistorySpecification;
-        }
-
-        public PneumaticProvider()
-        {
         }
 
         public virtual bool DownloadNzb(string url, string title, bool recentlyAired)
@@ -76,7 +70,7 @@ namespace NzbDrone.Core.Download.Clients
 
         public virtual bool IsInQueue(EpisodeParseResult newParseResult)
         {
-            return !_upgradeHistorySpecification.IsSatisfiedBy(newParseResult);
+            return false;
         }
     }
 }
diff --git a/NzbDrone.Core/History/History.cs b/NzbDrone.Core/History/History.cs
index 6ea64f968..b05b6569e 100644
--- a/NzbDrone.Core/History/History.cs
+++ b/NzbDrone.Core/History/History.cs
@@ -1,5 +1,5 @@
-using System.Linq;
-using System;
+using System;
+using Marr.Data;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Tv;
 
@@ -8,6 +8,7 @@ namespace NzbDrone.Core.History
     public class History : ModelBase
     {
         public int EpisodeId { get; set; }
+        public int SeriesId { get; set; }
         public string NzbTitle { get; set; }
         public QualityModel Quality { get; set; }
         public DateTime Date { get; set; }
@@ -15,5 +16,6 @@ namespace NzbDrone.Core.History
         public string NzbInfoUrl { get; set; }
         public string ReleaseGroup { get; set; }
 
+        public LazyLoaded<Episode> Episode { get; set; }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/MediaCover/MediaCover.cs b/NzbDrone.Core/MediaCover/MediaCover.cs
index f49d3adb3..f9354b572 100644
--- a/NzbDrone.Core/MediaCover/MediaCover.cs
+++ b/NzbDrone.Core/MediaCover/MediaCover.cs
@@ -1,4 +1,5 @@
 using System.Linq;
+using NzbDrone.Core.Datastore;
 
 namespace NzbDrone.Core.MediaCover
 {
@@ -10,9 +11,10 @@ namespace NzbDrone.Core.MediaCover
         Fanart = 2
     }
 
-    public class MediaCover
+    public class MediaCover : ModelBase
     {
         public MediaCoverTypes CoverType { get; set; }
         public string Url { get; set; }
+        public int SeriesId { get; set; }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/MediaCover/MediaCoverService.cs b/NzbDrone.Core/MediaCover/MediaCoverService.cs
index 778767181..b98413f65 100644
--- a/NzbDrone.Core/MediaCover/MediaCoverService.cs
+++ b/NzbDrone.Core/MediaCover/MediaCoverService.cs
@@ -37,7 +37,7 @@ namespace NzbDrone.Core.MediaCover
 
         private void EnsureCovers(Series series)
         {
-            foreach (var cover in series.Covers)
+            foreach (var cover in series.Covers.Value)
             {
                 var fileName = GetCoverPath(series.Id, cover.CoverType);
                 if (!_diskProvider.FileExists(fileName))
diff --git a/NzbDrone.Core/MetadataSource/TvDbProxy.cs b/NzbDrone.Core/MetadataSource/TvDbProxy.cs
index cb1af57e0..6de7d763a 100644
--- a/NzbDrone.Core/MetadataSource/TvDbProxy.cs
+++ b/NzbDrone.Core/MetadataSource/TvDbProxy.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using NLog;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.MediaCover;
 using NzbDrone.Core.Tv;
 using NzbDrone.Common;
@@ -55,7 +56,7 @@ namespace NzbDrone.Core.MetadataSource
             series.Title = tvDbSeries.SeriesName;
             series.AirTime = CleanAirsTime(tvDbSeries.Airs_Time);
             series.Overview = tvDbSeries.Overview;
-            series.Status = tvDbSeries.Status == "Continuing" ? SeriesStatusType.Continuing : SeriesStatusType.Ended ;
+            series.Status = tvDbSeries.Status == "Continuing" ? SeriesStatusType.Continuing : SeriesStatusType.Ended;
             series.Language = tvDbSeries.Language ?? string.Empty;
             series.CleanTitle = Parser.NormalizeTitle(tvDbSeries.SeriesName);
             series.LastInfoSync = DateTime.Now;
@@ -65,21 +66,20 @@ namespace NzbDrone.Core.MetadataSource
                 series.Runtime = Convert.ToInt32(tvDbSeries.Runtime);
             }
 
-            series.Covers = new List<MediaCover.MediaCover>();
 
             if (!string.IsNullOrWhiteSpace(tvDbSeries.banner))
             {
-                series.Covers.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = tvDbSeries.banner });
+                series.Covers.Value.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = tvDbSeries.banner, SeriesId = series.Id });
             }
 
             if (!string.IsNullOrWhiteSpace(tvDbSeries.fanart))
             {
-                series.Covers.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = tvDbSeries.fanart });
+                series.Covers.Value.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = tvDbSeries.fanart, SeriesId = series.Id });
             }
 
             if (!string.IsNullOrWhiteSpace(tvDbSeries.poster))
             {
-                series.Covers.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = tvDbSeries.poster });
+                series.Covers.Value.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = tvDbSeries.poster, SeriesId = series.Id });
             }
 
             series.Network = tvDbSeries.Network;
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 7263a87ef..142ad9d38 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -152,10 +152,6 @@
       <HintPath>..\packages\MediaInfoNet.0.3\lib\MediaInfoDotNet.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Libraries\Sqlite\Mono.Data.Sqlite.dll</HintPath>
-    </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
@@ -179,6 +175,14 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
+    </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
@@ -200,16 +204,18 @@
     <Compile Include="ContainerExtensions.cs" />
     <Compile Include="Datastore\Converters\BooleanIntConverter.cs" />
     <Compile Include="Datastore\Converters\Int32Converter.cs" />
+    <Compile Include="Datastore\Converters\EmbeddedDocumentConverter.cs" />
     <Compile Include="Datastore\Database.cs" />
     <Compile Include="Datastore\DbFactory.cs" />
+    <Compile Include="Datastore\EnumIntConverter.cs" />
+    <Compile Include="Datastore\IEmbeddedDocument.cs" />
+    <Compile Include="Datastore\LazyList.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationOptions.cs" />
     <Compile Include="Datastore\Migration\Framework\NlogAnnouncer.cs" />
     <Compile Include="Datastore\Migration\Migration20130324.cs" />
     <Compile Include="Datastore\Migration\Framework\NzbDroneMigrationBase.cs" />
     <Compile Include="Datastore\MigrationType.cs" />
-    <Compile Include="Datastore\Migration\Sqlite\MonoSqliteDbFactory.cs" />
-    <Compile Include="Datastore\Migration\Sqlite\MonoSqliteProcessorFactory.cs" />
     <Compile Include="Datastore\ModelBase.cs" />
     <Compile Include="Datastore\BasicRepository.cs" />
     <Compile Include="Datastore\TableMapping.cs" />
diff --git a/NzbDrone.Core/Tv/QualityModel.cs b/NzbDrone.Core/Tv/QualityModel.cs
index a778d0041..d1b83e483 100644
--- a/NzbDrone.Core/Tv/QualityModel.cs
+++ b/NzbDrone.Core/Tv/QualityModel.cs
@@ -1,10 +1,11 @@
 using System.Linq;
 using System;
+using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Qualities;
 
 namespace NzbDrone.Core.Tv
 {
-    public class QualityModel : IComparable<QualityModel>
+    public class QualityModel : IComparable<QualityModel>, IEmbeddedDocument
     {
         public Quality Quality { get; set; }
 
diff --git a/NzbDrone.Core/Tv/Series.cs b/NzbDrone.Core/Tv/Series.cs
index d23a80e5e..e8ea024a1 100644
--- a/NzbDrone.Core/Tv/Series.cs
+++ b/NzbDrone.Core/Tv/Series.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System;
+using System;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Qualities;
@@ -16,6 +15,11 @@ namespace NzbDrone.Core.Tv
 
     public class Series : ModelBase
     {
+        public Series()
+        {
+            Covers = new LazyList<MediaCover.MediaCover>();
+        }
+
         public int TvDbId { get; set; }
         public string Title { get; set; }
         public string CleanTitle { get; set; }
@@ -30,7 +34,7 @@ namespace NzbDrone.Core.Tv
         public DateTime? LastInfoSync { get; set; }
         public DateTime? LastDiskSync { get; set; }
         public int Runtime { get; set; }
-        public List<MediaCover.MediaCover> Covers { get; set; }
+        public LazyList<MediaCover.MediaCover> Covers { get; set; }
         public SeriesTypes SeriesType { get; set; }
         public BacklogSettingType BacklogSetting { get; set; }
         public string Network { get; set; }
@@ -44,9 +48,6 @@ namespace NzbDrone.Core.Tv
 
         public DateTime? FirstAired { get; set; }
         public QualityProfile QualityProfile { get; set; }
-        public int EpisodeCount { get; set; }
-        public int EpisodeFileCount { get; set; }
-        public int SeasonCount { get; set; }
         public DateTime? NextAiring { get; set; }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/packages.config b/NzbDrone.Core/packages.config
index ac76e5c2b..1ad4070ab 100644
--- a/NzbDrone.Core/packages.config
+++ b/NzbDrone.Core/packages.config
@@ -13,6 +13,6 @@
   <package id="RestSharp" version="104.1" targetFramework="net40" />
   <package id="SignalR.Hosting.Common" version="0.5.3" targetFramework="net40" />
   <package id="SignalR.Server" version="0.5.3" targetFramework="net40" />
-  <package id="System.Data.SQLite.x86" version="1.0.84.0" targetFramework="net40" />
+  <package id="System.Data.SQLite" version="1.0.84.0" targetFramework="net40" />
   <package id="twitterizer" version="2.4.0.26532" />
 </packages>
\ No newline at end of file
diff --git a/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj b/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
index a43fc8f6c..e4bf58bce 100644
--- a/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
+++ b/NzbDrone.Update.Test/NzbDrone.Update.Test.csproj
@@ -43,9 +43,9 @@
     <Reference Include="FizzWare.NBuilder, Version=3.0.1.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
       <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+    <Reference Include="FluentAssertions, Version=2.0.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.2.0.0.1\lib\net40\FluentAssertions.dll</HintPath>
+      <HintPath>..\packages\FluentAssertions.2.0.1\lib\net40\FluentAssertions.dll</HintPath>
     </Reference>
     <Reference Include="Moq">
       <HintPath>..\packages\Moq.4.0.10827\lib\NET40\Moq.dll</HintPath>
diff --git a/NzbDrone.Update.Test/packages.config b/NzbDrone.Update.Test/packages.config
index abc526247..d737a70e2 100644
--- a/NzbDrone.Update.Test/packages.config
+++ b/NzbDrone.Update.Test/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="2.0.0.1" targetFramework="net40" />
+  <package id="FluentAssertions" version="2.0.1" targetFramework="net40" />
   <package id="Moq" version="4.0.10827" />
   <package id="NBuilder" version="3.0.1.1" />
   <package id="NUnit" version="2.6.2" targetFramework="net40" />
diff --git a/NzbDrone.sln b/NzbDrone.sln
index 4039a8310..4c6d54ad6 100644
--- a/NzbDrone.sln
+++ b/NzbDrone.sln
@@ -49,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Backbone", "NzbDro
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NzbDrone.Console", "NzbDrone.Console\NzbDrone.Console.csproj", "{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Marr.Data", "..\..\..\Users\Keivan\Desktop\Marr.Data\Marr.Data.csproj", "{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -349,6 +351,24 @@ Global
 		{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x64.ActiveCfg = Release|x86
 		{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x86.ActiveCfg = Release|x86
 		{3DCA7B58-B8B3-49AC-9D9E-56F4A0460976}.Services|x86.Build.0 = Release|x86
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Any CPU.ActiveCfg = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Any CPU.Build.0 = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|Mixed Platforms.Build.0 = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|x64.ActiveCfg = Release|Any CPU
+		{F6FC6BE7-0847-4817-A1ED-223DC647C3D7}.Services|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index 807829a60..abc3a2c6a 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -89,14 +89,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=AMD64">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.84.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Data.SQLite.x86.1.0.84.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
-    </Reference>
     <Reference Include="System.ServiceProcess" />
   </ItemGroup>
   <ItemGroup>
@@ -168,7 +160,7 @@
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\x86\*.*"   "$(TargetDir)"</PostBuildEvent>
+    <PostBuildEvent>xcopy /s /y "$(SolutionDir)\Libraries\Sqlite\*.*"   "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/NzbDrone/packages.config b/NzbDrone/packages.config
index baccdcc0c..bcfe36c81 100644
--- a/NzbDrone/packages.config
+++ b/NzbDrone/packages.config
@@ -9,5 +9,4 @@
   <package id="NLog" version="2.0.0.2000" />
   <package id="NLog.Config" version="2.0.0.2000" targetFramework="net40" />
   <package id="NLog.Schema" version="2.0.0.2000" targetFramework="net40" />
-  <package id="System.Data.SQLite.x86" version="1.0.84.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/SqlCe/NzbDrone.SqlCe.dll b/SqlCe/NzbDrone.SqlCe.dll
deleted file mode 100644
index 763ab5005..000000000
Binary files a/SqlCe/NzbDrone.SqlCe.dll and /dev/null differ
diff --git a/SqlCe/System.Data.SqlServerCe.dll b/SqlCe/System.Data.SqlServerCe.dll
deleted file mode 100644
index 8d16c2a6d..000000000
Binary files a/SqlCe/System.Data.SqlServerCe.dll and /dev/null differ
diff --git a/SqlCe/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest b/SqlCe/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
deleted file mode 100644
index bbd12ccde..000000000
--- a/SqlCe/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <noInheritable></noInheritable>
-    <assemblyIdentity type="win32" name="Microsoft.VC90.CRT" version="9.0.30729.4148" processorArchitecture="x86" publicKeyToken="1fc8b3b9a1e18e3b"></assemblyIdentity>
-    <file name="msvcr90.dll" hashalg="SHA1" hash="98e8006e0a4542e69f1a3555b927758bd76ca07d"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>+CXED+6HzJlSphyMNOn27ujadC0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcp90.dll" hashalg="SHA1" hash="3aec3be680024a46813dee891a753bd58b3f3b12"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>MyKED+9DyS+1XcMeaC0Zlw2vFZ0=</dsig:DigestValue></asmv2:hash></file> <file name="msvcm90.dll" hashalg="SHA1" hash="0195dd0896d74b62531e4f3c771904a3d996450e"><asmv2:hash xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:Transforms><dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity"></dsig:Transform></dsig:Transforms><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></dsig:DigestMethod><dsig:DigestValue>EeyDE7og6WoPd2oBhYbMEnpFHhY=</dsig:DigestValue></asmv2:hash></file>
-</assembly>
\ No newline at end of file
diff --git a/SqlCe/x86/Microsoft.VC90.CRT/README_ENU.txt b/SqlCe/x86/Microsoft.VC90.CRT/README_ENU.txt
deleted file mode 100644
index fc38b3684..000000000
Binary files a/SqlCe/x86/Microsoft.VC90.CRT/README_ENU.txt and /dev/null differ
diff --git a/SqlCe/x86/Microsoft.VC90.CRT/msvcr90.dll b/SqlCe/x86/Microsoft.VC90.CRT/msvcr90.dll
deleted file mode 100644
index e2e66019c..000000000
Binary files a/SqlCe/x86/Microsoft.VC90.CRT/msvcr90.dll and /dev/null differ
diff --git a/SqlCe/x86/sqlceca40.dll b/SqlCe/x86/sqlceca40.dll
deleted file mode 100644
index 92596101e..000000000
Binary files a/SqlCe/x86/sqlceca40.dll and /dev/null differ
diff --git a/SqlCe/x86/sqlcecompact40.dll b/SqlCe/x86/sqlcecompact40.dll
deleted file mode 100644
index 41c69ecc5..000000000
Binary files a/SqlCe/x86/sqlcecompact40.dll and /dev/null differ
diff --git a/SqlCe/x86/sqlceer40EN.dll b/SqlCe/x86/sqlceer40EN.dll
deleted file mode 100644
index a40154fd3..000000000
Binary files a/SqlCe/x86/sqlceer40EN.dll and /dev/null differ
diff --git a/SqlCe/x86/sqlceme40.dll b/SqlCe/x86/sqlceme40.dll
deleted file mode 100644
index d737119fa..000000000
Binary files a/SqlCe/x86/sqlceme40.dll and /dev/null differ
diff --git a/SqlCe/x86/sqlceqp40.dll b/SqlCe/x86/sqlceqp40.dll
deleted file mode 100644
index dedfc9a3c..000000000
Binary files a/SqlCe/x86/sqlceqp40.dll and /dev/null differ
diff --git a/SqlCe/x86/sqlcese40.dll b/SqlCe/x86/sqlcese40.dll
deleted file mode 100644
index cc37e3b54..000000000
Binary files a/SqlCe/x86/sqlcese40.dll and /dev/null differ