diff --git a/Ombi/Assemblies/TraktApiSharp.dll b/Ombi/Assemblies/TraktApiSharp.dll
new file mode 100644
index 000000000..34e1cbe72
Binary files /dev/null and b/Ombi/Assemblies/TraktApiSharp.dll differ
diff --git a/Ombi/Ombi.Api.Trakt/ITraktApi.cs b/Ombi/Ombi.Api.Trakt/ITraktApi.cs
index ac466df7f..17c4203cb 100644
--- a/Ombi/Ombi.Api.Trakt/ITraktApi.cs
+++ b/Ombi/Ombi.Api.Trakt/ITraktApi.cs
@@ -1,16 +1,16 @@
-//using System.Collections.Generic;
-//using System.Threading.Tasks;
-//using TraktApiSharp.Enums;
-//using TraktApiSharp.Objects.Get.Shows;
-//using TraktApiSharp.Objects.Get.Shows.Common;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using TraktApiSharp.Enums;
+using TraktApiSharp.Objects.Get.Shows;
+using TraktApiSharp.Objects.Get.Shows.Common;
 
-//namespace Ombi.Api.Trakt
-//{
-//    public interface ITraktApi
-//    {
-//        Task<IEnumerable<TraktMostAnticipatedShow>> GetAnticipatedShows(int? page = default(int?), int? limitPerPage = default(int?));
-//        Task<IEnumerable<TraktMostWatchedShow>> GetMostWatchesShows(TraktTimePeriod period = null, int? page = default(int?), int? limitPerPage = default(int?));
-//        Task<IEnumerable<TraktShow>> GetPopularShows(int? page = default(int?), int? limitPerPage = default(int?));
-//        Task<IEnumerable<TraktTrendingShow>> GetTrendingShows(int? page = default(int?), int? limitPerPage = default(int?));
-//    }
-//}
\ No newline at end of file
+namespace Ombi.Api.Trakt
+{
+    public interface ITraktApi
+    {
+        Task<IEnumerable<TraktMostAnticipatedShow>> GetAnticipatedShows(int? page = default(int?), int? limitPerPage = default(int?));
+        Task<IEnumerable<TraktMostWatchedShow>> GetMostWatchesShows(TraktTimePeriod period = null, int? page = default(int?), int? limitPerPage = default(int?));
+        Task<IEnumerable<TraktShow>> GetPopularShows(int? page = default(int?), int? limitPerPage = default(int?));
+        Task<IEnumerable<TraktTrendingShow>> GetTrendingShows(int? page = default(int?), int? limitPerPage = default(int?));
+    }
+}
\ No newline at end of file
diff --git a/Ombi/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj b/Ombi/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj
index c173d1dd7..cc4ae2925 100644
--- a/Ombi/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj
+++ b/Ombi/Ombi.Api.Trakt/Ombi.Api.Trakt.csproj
@@ -9,4 +9,10 @@
     <ProjectReference Include="..\Ombi.Helpers\Ombi.Helpers.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="TraktApiSharp">
+      <HintPath>..\Assemblies\TraktApiSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Ombi/Ombi.Api.Trakt/TraktApi.cs b/Ombi/Ombi.Api.Trakt/TraktApi.cs
index 8ee6fc20a..975900256 100644
--- a/Ombi/Ombi.Api.Trakt/TraktApi.cs
+++ b/Ombi/Ombi.Api.Trakt/TraktApi.cs
@@ -1,49 +1,49 @@
-//using System;
-//using System.Collections.Generic;
-//using System.Threading.Tasks;
-//using Ombi.Helpers;
-//using TraktApiSharp;
-//using TraktApiSharp.Enums;
-//using TraktApiSharp.Objects.Get.Shows;
-//using TraktApiSharp.Objects.Get.Shows.Common;
-//using TraktApiSharp.Requests.Parameters;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Ombi.Helpers;
+using TraktApiSharp;
+using TraktApiSharp.Enums;
+using TraktApiSharp.Objects.Get.Shows;
+using TraktApiSharp.Objects.Get.Shows.Common;
+using TraktApiSharp.Requests.Parameters;
 
-//namespace Ombi.Api.Trakt
-//{
-//    public class TraktApi : ITraktApi
-//    {
-//        private TraktClient Client { get; }
+namespace Ombi.Api.Trakt
+{
+    public class TraktApi : ITraktApi
+    {
+        private TraktClient Client { get; }
 
-//        private static readonly string Encrypted = "MTM0ZTU2ODM1MGY3NDI3NTExZTI1N2E2NTM0MDI2NjYwNDgwY2Y5YjkzYzc3ZjczNzhmMzQwNjAzYjY3MzgxZA==";
-//        private readonly string _apiKey = StringCipher.DecryptString(Encrypted, "ApiKey");
-//        public TraktApi()
-//        {
-//            Client = new TraktClient(_apiKey);
-//        }
+        private static readonly string Encrypted = "MTM0ZTU2ODM1MGY3NDI3NTExZTI1N2E2NTM0MDI2NjYwNDgwY2Y5YjkzYzc3ZjczNzhmMzQwNjAzYjY3MzgxZA==";
+        private readonly string _apiKey = StringCipher.DecryptString(Encrypted, "ApiKey");
+        public TraktApi()
+        {
+            Client = new TraktClient(_apiKey);
+        }
 
-//        public async Task<IEnumerable<TraktShow>> GetPopularShows(int? page = null, int? limitPerPage = null)
-//        {
-//            var popular = await Client.Shows.GetPopularShowsAsync(new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
-//            return popular.Value;
-//        }
+        public async Task<IEnumerable<TraktShow>> GetPopularShows(int? page = null, int? limitPerPage = null)
+        {
+            var popular = await Client.Shows.GetPopularShowsAsync(new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
+            return popular.Value;
+        }
 
-//        public async Task<IEnumerable<TraktTrendingShow>> GetTrendingShows(int? page = null, int? limitPerPage = null)
-//        {
-//            var trendingShowsTop10 = await Client.Shows.GetTrendingShowsAsync(new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
-//            return trendingShowsTop10.Value;
-//        }
+        public async Task<IEnumerable<TraktTrendingShow>> GetTrendingShows(int? page = null, int? limitPerPage = null)
+        {
+            var trendingShowsTop10 = await Client.Shows.GetTrendingShowsAsync(new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
+            return trendingShowsTop10.Value;
+        }
 
-//        public async Task<IEnumerable<TraktMostAnticipatedShow>> GetAnticipatedShows(int? page = null, int? limitPerPage = null)
-//        {
-//            var anticipatedShows = await Client.Shows.GetMostAnticipatedShowsAsync(new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
-//            return anticipatedShows.Value;
-//        }
+        public async Task<IEnumerable<TraktMostAnticipatedShow>> GetAnticipatedShows(int? page = null, int? limitPerPage = null)
+        {
+            var anticipatedShows = await Client.Shows.GetMostAnticipatedShowsAsync(new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
+            return anticipatedShows.Value;
+        }
 
-//        public async Task<IEnumerable<TraktMostWatchedShow>> GetMostWatchesShows(TraktTimePeriod period = null, int? page = null, int? limitPerPage = null)
-//        {
-//            var anticipatedShows = await Client.Shows.GetMostWatchedShowsAsync(period ?? TraktTimePeriod.Monthly, new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
-//            return anticipatedShows.Value;
-//        }
-//    }
-//}
+        public async Task<IEnumerable<TraktMostWatchedShow>> GetMostWatchesShows(TraktTimePeriod period = null, int? page = null, int? limitPerPage = null)
+        {
+            var anticipatedShows = await Client.Shows.GetMostWatchedShowsAsync(period ?? TraktTimePeriod.Monthly, new TraktExtendedInfo { Full = true }, null, page ?? 1, limitPerPage ?? 10);
+            return anticipatedShows.Value;
+        }
+    }
+}
 
diff --git a/Ombi/Ombi.Core/Engine/Interfaces/ITvSearchEngine.cs b/Ombi/Ombi.Core/Engine/Interfaces/ITvSearchEngine.cs
index 5e08ccb3d..ae88e5fdb 100644
--- a/Ombi/Ombi.Core/Engine/Interfaces/ITvSearchEngine.cs
+++ b/Ombi/Ombi.Core/Engine/Interfaces/ITvSearchEngine.cs
@@ -7,9 +7,9 @@ namespace Ombi.Core.Engine
     public interface ITvSearchEngine
     {
         Task<IEnumerable<SearchTvShowViewModel>> Search(string searchTerm);
-        //Task<IEnumerable<SearchTvShowViewModel>> Popular();
-        //Task<IEnumerable<SearchTvShowViewModel>> Anticipated();
-        //Task<IEnumerable<SearchTvShowViewModel>> MostWatches();
-        //Task<IEnumerable<SearchTvShowViewModel>> Trending();
+        Task<IEnumerable<SearchTvShowViewModel>> Popular();
+        Task<IEnumerable<SearchTvShowViewModel>> Anticipated();
+        Task<IEnumerable<SearchTvShowViewModel>> MostWatches();
+        Task<IEnumerable<SearchTvShowViewModel>> Trending();
     }
 }
\ No newline at end of file
diff --git a/Ombi/Ombi.Core/Engine/TvSearchEngine.cs b/Ombi/Ombi.Core/Engine/TvSearchEngine.cs
index 4f4d62be9..90e560209 100644
--- a/Ombi/Ombi.Core/Engine/TvSearchEngine.cs
+++ b/Ombi/Ombi.Core/Engine/TvSearchEngine.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Security.Principal;
 using System.Threading.Tasks;
 using AutoMapper;
-//using Ombi.Api.Trakt;
+using Ombi.Api.Trakt;
 using Ombi.Api.TvMaze;
 using Ombi.Core.Models.Requests;
 using Ombi.Core.Models.Search;
@@ -18,21 +18,21 @@ namespace Ombi.Core.Engine
     {
 
         public TvSearchEngine(IPrincipal identity, IRequestServiceMain service, ITvMazeApi tvMaze, IMapper mapper, ISettingsService<PlexSettings> plexSettings,
-            ISettingsService<EmbySettings> embySettings/*, ITraktApi trakt*/) 
+            ISettingsService<EmbySettings> embySettings, ITraktApi trakt) 
             : base(identity, service)
         {
             TvMazeApi = tvMaze;
             Mapper = mapper;
             PlexSettings = plexSettings;
             EmbySettings = embySettings;
-            //TraktApi = trakt;
+            TraktApi = trakt;
         }
 
         private ITvMazeApi TvMazeApi { get; }
         private IMapper Mapper { get; }
         private ISettingsService<PlexSettings> PlexSettings { get; }
         private ISettingsService<EmbySettings> EmbySettings { get; }
-        //private ITraktApi TraktApi { get; }
+        private ITraktApi TraktApi { get; }
 
 
         public async Task<IEnumerable<SearchTvShowViewModel>> Search(string searchTerm)
@@ -46,27 +46,27 @@ namespace Ombi.Core.Engine
             return null;
         }
 
-        //public async Task<IEnumerable<SearchTvShowViewModel>> Popular()
-        //{
-        //    var result = await TraktApi.GetPopularShows();
-        //    return await ProcessResults(result);
-        //}
+        public async Task<IEnumerable<SearchTvShowViewModel>> Popular()
+        {
+            var result = await TraktApi.GetPopularShows();
+            return await ProcessResults(result);
+        }
 
-        //public async Task<IEnumerable<SearchTvShowViewModel>> Anticipated()
-        //{
-        //    var result = await TraktApi.GetAnticipatedShows();
-        //    return await ProcessResults(result);
-        //}
-        //public async Task<IEnumerable<SearchTvShowViewModel>> MostWatches()
-        //{
-        //    var result = await TraktApi.GetMostWatchesShows();
-        //    return await ProcessResults(result);
-        //}
-        //public async Task<IEnumerable<SearchTvShowViewModel>> Trending()
-        //{
-        //    var result = await TraktApi.GetTrendingShows();
-        //    return await ProcessResults(result);
-        //}
+        public async Task<IEnumerable<SearchTvShowViewModel>> Anticipated()
+        {
+            var result = await TraktApi.GetAnticipatedShows();
+            return await ProcessResults(result);
+        }
+        public async Task<IEnumerable<SearchTvShowViewModel>> MostWatches()
+        {
+            var result = await TraktApi.GetMostWatchesShows();
+            return await ProcessResults(result);
+        }
+        public async Task<IEnumerable<SearchTvShowViewModel>> Trending()
+        {
+            var result = await TraktApi.GetTrendingShows();
+            return await ProcessResults(result);
+        }
 
         private async Task<IEnumerable<SearchTvShowViewModel>> ProcessResults<T>(IEnumerable<T> items)
         {
diff --git a/Ombi/Ombi.Core/Ombi.Core.csproj b/Ombi/Ombi.Core/Ombi.Core.csproj
index 6f02e21b2..d58486855 100644
--- a/Ombi/Ombi.Core/Ombi.Core.csproj
+++ b/Ombi/Ombi.Core/Ombi.Core.csproj
@@ -26,4 +26,10 @@
     <ProjectReference Include="..\Ombi.TheMovieDbApi\Ombi.Api.TheMovieDb.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="TraktApiSharp">
+      <HintPath>..\Assemblies\TraktApiSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/Ombi/Ombi/Controllers/SearchController.cs b/Ombi/Ombi/Controllers/SearchController.cs
index 3ecccc264..0e870acc1 100644
--- a/Ombi/Ombi/Controllers/SearchController.cs
+++ b/Ombi/Ombi/Controllers/SearchController.cs
@@ -65,25 +65,25 @@ namespace Ombi.Controllers
             return await TvEngine.Search(searchTerm);
         }
 
-        //[HttpGet("tv/popular")]
-        //public async Task<IEnumerable<SearchTvShowViewModel>> PopularTv()
-        //{
-        //    return await TvEngine.Popular();
-        //}
-        //[HttpGet("tv/anticiplated")]
-        //public async Task<IEnumerable<SearchTvShowViewModel>> AnticiplatedTv()
-        //{
-        //    return await TvEngine.Anticipated();
-        //}
-        //[HttpGet("tv/mostwatched")]
-        //public async Task<IEnumerable<SearchTvShowViewModel>> MostWatched()
-        //{
-        //    return await TvEngine.MostWatches();
-        //}
-        //[HttpGet("tv/trending")]
-        //public async Task<IEnumerable<SearchTvShowViewModel>> Trending()
-        //{
-        //    return await TvEngine.Trending();
-        //}
+        [HttpGet("tv/popular")]
+        public async Task<IEnumerable<SearchTvShowViewModel>> PopularTv()
+        {
+            return await TvEngine.Popular();
+        }
+        [HttpGet("tv/anticiplated")]
+        public async Task<IEnumerable<SearchTvShowViewModel>> AnticiplatedTv()
+        {
+            return await TvEngine.Anticipated();
+        }
+        [HttpGet("tv/mostwatched")]
+        public async Task<IEnumerable<SearchTvShowViewModel>> MostWatched()
+        {
+            return await TvEngine.MostWatches();
+        }
+        [HttpGet("tv/trending")]
+        public async Task<IEnumerable<SearchTvShowViewModel>> Trending()
+        {
+            return await TvEngine.Trending();
+        }
     }
 }
diff --git a/Ombi/Ombi/Ombi.csproj b/Ombi/Ombi/Ombi.csproj
index ca485e117..6a870871b 100644
--- a/Ombi/Ombi/Ombi.csproj
+++ b/Ombi/Ombi/Ombi.csproj
@@ -48,6 +48,12 @@
     <ProjectReference Include="..\Ombi.TheMovieDbApi\Ombi.Api.TheMovieDb.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="TraktApiSharp">
+      <HintPath>..\Assemblies\TraktApiSharp.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
   <ItemGroup>
     <Content Update="wwwroot\app\interfaces\ISearchMovieResult - Copy.js">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
diff --git a/Ombi/Ombi/Startup.cs b/Ombi/Ombi/Startup.cs
index 1a57e7420..326a4cdca 100644
--- a/Ombi/Ombi/Startup.cs
+++ b/Ombi/Ombi/Startup.cs
@@ -59,10 +59,10 @@ namespace Ombi
             // Add framework services.
             services.AddMvc();
             services.AddOmbiMappingProfile();
-            services.AddAutoMapper(expression =>
-            {
-                expression.AddCollectionMappers();
-            });
+            //services.AddAutoMapper(expression =>
+            //{
+            //    expression.AddCollectionMappers();
+            //});
             services.RegisterDependencies(); // Ioc and EF
             
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();