diff --git a/src/Huxley/App_Start/NinjectWebCommon.cs b/src/Huxley/App_Start/NinjectWebCommon.cs
new file mode 100644
index 0000000..0571018
--- /dev/null
+++ b/src/Huxley/App_Start/NinjectWebCommon.cs
@@ -0,0 +1,50 @@
+using Huxley.ldbServiceReference;
+
+[assembly: WebActivatorEx.PreApplicationStartMethod(typeof(Huxley.App_Start.NinjectWebCommon), "Start")]
+[assembly: WebActivatorEx.ApplicationShutdownMethodAttribute(typeof(Huxley.App_Start.NinjectWebCommon), "Stop")]
+
+namespace Huxley.App_Start {
+    using System;
+    using System.Web;
+    using Microsoft.Web.Infrastructure.DynamicModuleHelper;
+    using Ninject;
+    using Ninject.Web.Common;
+
+    public static class NinjectWebCommon {
+        private static readonly Bootstrapper Bootstrapper = new Bootstrapper();
+
+        /// <summary>
+        /// Starts the application
+        /// </summary>
+        public static void Start() {
+            DynamicModuleUtility.RegisterModule(typeof(OnePerRequestHttpModule));
+            DynamicModuleUtility.RegisterModule(typeof(NinjectHttpModule));
+            Bootstrapper.Initialize(CreateKernel);
+        }
+
+        /// <summary>
+        /// Stops the application.
+        /// </summary>
+        public static void Stop() {
+            Bootstrapper.ShutDown();
+        }
+
+        /// <summary>
+        /// Creates the kernel that will manage your application.
+        /// </summary>
+        /// <returns>The created kernel.</returns>
+        private static IKernel CreateKernel() {
+            var kernel = new StandardKernel();
+            try {
+                kernel.Bind<Func<IKernel>>().ToMethod(ctx => () => new Bootstrapper().Kernel);
+                kernel.Bind<IHttpModule>().To<HttpApplicationInitializationHttpModule>();
+                kernel.Bind<ILdbClient>().To<LdbClient>().InRequestScope();
+                kernel.Bind<LDBServiceSoapClient>().To<LDBServiceSoapClient>().InRequestScope();
+                return kernel;
+            } catch {
+                kernel.Dispose();
+                throw;
+            }
+        }
+    }
+}
diff --git a/src/Huxley/Controllers/CrsController.cs b/src/Huxley/Controllers/CrsController.cs
index 46a0cba..8c40f41 100644
--- a/src/Huxley/Controllers/CrsController.cs
+++ b/src/Huxley/Controllers/CrsController.cs
@@ -32,6 +32,9 @@ public IEnumerable<CrsRecord> Get() {
 
         // GET /crs/{query}
         public IEnumerable<CrsRecord> Get(string query) {
+            if (query.Equals("London Terminals", StringComparison.InvariantCultureIgnoreCase)) {
+                return HuxleyApi.LondonTerminals;
+            }
             // Could use a RegEx here but putting user input into a RegEx can be dangerous
             var results = HuxleyApi.CrsCodes.Where(c => c.StationName.IndexOf(query, StringComparison.InvariantCultureIgnoreCase) >= 0);
             return results;
diff --git a/src/Huxley/Controllers/DelaysController.cs b/src/Huxley/Controllers/DelaysController.cs
index c00d3d5..3152df2 100644
--- a/src/Huxley/Controllers/DelaysController.cs
+++ b/src/Huxley/Controllers/DelaysController.cs
@@ -22,14 +22,18 @@ You should have received a copy of the GNU Affero General Public License
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.ServiceModel;
 using System.Threading.Tasks;
 using System.Web.Http;
 using Huxley.Models;
 using Huxley.ldbServiceReference;
 
 namespace Huxley.Controllers {
-    public class DelaysController : BaseController {
+    public class DelaysController : LdbController {
+
+        public DelaysController(ILdbClient client)
+            : base(client) {
+        }
+
         // GET /delays/{crs}/{filtertype}/{filtercrs}/{numrows}/{stds}?accessToken=[your token]
         public async Task<DelaysResponse> Get([FromUri] StationBoardRequest request) {
 
@@ -61,121 +65,81 @@ public async Task<DelaysResponse> Get([FromUri] StationBoardRequest request) {
                 }
             }
 
-            // https://en.wikipedia.org/wiki/London_station_group 
-            // Farringdon [ZFD] is not a London Terminal but it probably should be (maybe when Crossrail opens it will be)
-            var londonTerminals = new List<string> {
-                "BFR", // Blackfriars
-                "CST", // Cannon Street
-                "CHX", // Charing Cross
-                "CTX", // City Thameslink
-                "EUS", // Euston
-                "FST", // Fenchurch Street
-                "KGX", // King's Cross
-                "LST", // Liverpool Street
-                "LBG", // London Bridge
-                "MYB", // Marylebone
-                "MOG", // Moorgate
-                "OLD", // Old Street
-                "PAD", // Paddington
-                "STP", // St. Pancras
-                "VXH", // Vauxhall
-                "VIC", // Victoria
-                "WAT", // Waterloo
-                "WAE", // Waterloo East
-            };
-
-            var client = new LDBServiceSoapClient();
+            var totalDelayMinutes = 0;
+            var delayedTrains = new List<ServiceItem>();
 
-            // Avoiding Problems with the Using Statement in WCF clients
-            // https://msdn.microsoft.com/en-us/library/aa355056.aspx
-            try {
-                var totalDelayMinutes = 0;
-                var delayedTrains = new List<ServiceItem>();
+            var token = MakeAccessToken(request.AccessToken);
 
-                var token = MakeAccessToken(request.AccessToken);
+            var filterCrs = request.FilterCrs;
+            if (request.FilterCrs.Equals("LON", StringComparison.InvariantCultureIgnoreCase) ||
+                request.FilterCrs.Equals("London", StringComparison.InvariantCultureIgnoreCase)) {
+                filterCrs = null;
+            }
 
-                var filterCrs = request.FilterCrs;
-                if (request.FilterCrs.Equals("LON", StringComparison.InvariantCultureIgnoreCase) ||
-                    request.FilterCrs.Equals("London", StringComparison.InvariantCultureIgnoreCase)) {
-                    filterCrs = null;
-                }
-
-                var board = await client.GetDepartureBoardAsync(token, request.NumRows, request.Crs, filterCrs, request.FilterType, 0, 0);
-
-                var response = board.GetStationBoardResult;
-                var filterLocationName = response.filterLocationName;
-
-                var trainServices = response.trainServices ?? new ServiceItem[0];
-                var railReplacement = null != response.busServices && !trainServices.Any() && response.busServices.Any();
-                var messagesPresent = null != response.nrccMessages && response.nrccMessages.Any();
-
-                if (null == filterCrs) {
-                    // This only finds trains terminating at London terminals. BFR/STP etc. won't be picked up if called at en-route.
-                    // Could query for every terminal or get service for every train and check calling points. Very chatty either way.
-                    switch (request.FilterType) {
-                        case FilterType.to:
-                            trainServices = trainServices.Where(ts => ts.destination.Any(d => londonTerminals.Contains(d.crs.ToUpperInvariant()))).ToArray();
-                            break;
-                        case FilterType.from:
-                            trainServices = trainServices.Where(ts => ts.origin.Any(d => londonTerminals.Contains(d.crs.ToUpperInvariant()))).ToArray();
-                            break;
-                        default:
-                            throw new ArgumentOutOfRangeException();
-                    }
-                    filterCrs = "LON";
-                    filterLocationName = "London";
+            var board = await Client.GetDepartureBoardAsync(token, request.NumRows, request.Crs, filterCrs, request.FilterType, 0, 0);
+
+            var response = board.GetStationBoardResult;
+            var filterLocationName = response.filterLocationName;
+
+            var trainServices = response.trainServices ?? new ServiceItem[0];
+            var railReplacement = null != response.busServices && !trainServices.Any() && response.busServices.Any();
+            var messagesPresent = null != response.nrccMessages && response.nrccMessages.Any();
+
+            if (null == filterCrs) {
+                // This only finds trains terminating at London terminals. BFR/STP etc. won't be picked up if called at en-route.
+                // Could query for every terminal or get service for every train and check calling points. Very chatty either way.
+                switch (request.FilterType) {
+                    case FilterType.to:
+                        trainServices = trainServices.Where(ts => ts.destination.Any(d => HuxleyApi.LondonTerminals.Any(lt => lt.CrsCode == d.crs.ToUpperInvariant()))).ToArray();
+                        break;
+                    case FilterType.from:
+                        trainServices = trainServices.Where(ts => ts.origin.Any(o => HuxleyApi.LondonTerminals.Any(lt => lt.CrsCode == o.crs.ToUpperInvariant()))).ToArray();
+                        break;
+                    default:
+                        throw new ArgumentOutOfRangeException();
                 }
+                filterCrs = "LON";
+                filterLocationName = "London";
+            }
 
-                // If STDs are provided then select only the train(s) matching them
-                if (stds.Count > 0) {
-                    trainServices = trainServices.Where(ts => stds.Contains(ts.std.Replace(":", ""))).ToArray();
-                }
+            // If STDs are provided then select only the train(s) matching them
+            if (stds.Count > 0) {
+                trainServices = trainServices.Where(ts => stds.Contains(ts.std.Replace(":", ""))).ToArray();
+            }
 
-                // Parse the response from the web service.
-                foreach (var si in trainServices.Where(si => !si.etd.Equals("On time", StringComparison.InvariantCultureIgnoreCase))) {
-                    if (si.etd.Equals("Delayed", StringComparison.InvariantCultureIgnoreCase) ||
-                        si.etd.Equals("Cancelled", StringComparison.InvariantCultureIgnoreCase)) {
-                        delayedTrains.Add(si);
-                    } else {
-                        DateTime etd;
-                        // Could be "Starts Here", "No Report" or contain a * (report overdue)
-                        if (DateTime.TryParse(si.etd.Replace("*", ""), out etd)) {
-                            DateTime std;
-                            if (DateTime.TryParse(si.std, out std)) {
-                                var late = etd.Subtract(std);
-                                totalDelayMinutes += (int)late.TotalMinutes;
-                                if (late.TotalMinutes > HuxleyApi.Settings.DelayMinutesThreshold) {
-                                    delayedTrains.Add(si);
-                                }
+            // Parse the response from the web service.
+            foreach (var si in trainServices.Where(si => !si.etd.Equals("On time", StringComparison.InvariantCultureIgnoreCase))) {
+                if (si.etd.Equals("Delayed", StringComparison.InvariantCultureIgnoreCase) ||
+                    si.etd.Equals("Cancelled", StringComparison.InvariantCultureIgnoreCase)) {
+                    delayedTrains.Add(si);
+                } else {
+                    DateTime etd;
+                    // Could be "Starts Here", "No Report" or contain a * (report overdue)
+                    if (DateTime.TryParse(si.etd.Replace("*", ""), out etd)) {
+                        DateTime std;
+                        if (DateTime.TryParse(si.std, out std)) {
+                            var late = etd.Subtract(std);
+                            totalDelayMinutes += (int)late.TotalMinutes;
+                            if (late.TotalMinutes > HuxleyApi.Settings.DelayMinutesThreshold) {
+                                delayedTrains.Add(si);
                             }
                         }
                     }
                 }
-
-                return new DelaysResponse {
-                    GeneratedAt = response.generatedAt,
-                    Crs = response.crs,
-                    LocationName = response.locationName,
-                    Filtercrs = filterCrs,
-                    FilterLocationName = filterLocationName,
-                    Delays = delayedTrains.Count > 0 || railReplacement || messagesPresent,
-                    TotalTrainsDelayed = delayedTrains.Count,
-                    TotalDelayMinutes = totalDelayMinutes,
-                    TotalTrains = trainServices.Length,
-                    DelayedTrains = delayedTrains,
-                };
-
-            } catch (CommunicationException) {
-                client.Abort();
-            } catch (TimeoutException) {
-                client.Abort();
-            } catch (Exception) {
-                client.Abort();
-                throw;
-            } finally {
-                client.Close();
             }
-            return new DelaysResponse();
+
+            return new DelaysResponse {
+                GeneratedAt = response.generatedAt,
+                Crs = response.crs,
+                LocationName = response.locationName,
+                Filtercrs = filterCrs,
+                FilterLocationName = filterLocationName,
+                Delays = delayedTrains.Count > 0 || railReplacement || messagesPresent,
+                TotalTrainsDelayed = delayedTrains.Count,
+                TotalDelayMinutes = totalDelayMinutes,
+                TotalTrains = trainServices.Length,
+                DelayedTrains = delayedTrains,
+            };
         }
     }
 }
\ No newline at end of file
diff --git a/src/Huxley/Controllers/BaseController.cs b/src/Huxley/Controllers/LdbController.cs
similarity index 91%
rename from src/Huxley/Controllers/BaseController.cs
rename to src/Huxley/Controllers/LdbController.cs
index b4592af..d806ead 100644
--- a/src/Huxley/Controllers/BaseController.cs
+++ b/src/Huxley/Controllers/LdbController.cs
@@ -24,7 +24,14 @@ You should have received a copy of the GNU Affero General Public License
 using Huxley.ldbServiceReference;
 
 namespace Huxley.Controllers {
-    public class BaseController : ApiController {
+    public class LdbController : ApiController {
+
+        protected readonly ILdbClient Client;
+
+        public LdbController(ILdbClient client) {
+            Client = client;
+        }
+
         protected static AccessToken MakeAccessToken(Guid accessToken) {
             // If ClientAccessToken is an empty GUID then no token is required in the Huxley URL.
             // If ClientAccessToken matches the token in the URL then the DarwinAccessToken will be used instead in the SOAP call.
diff --git a/src/Huxley/Controllers/ServiceController.cs b/src/Huxley/Controllers/ServiceController.cs
index 4993595..3a201ec 100644
--- a/src/Huxley/Controllers/ServiceController.cs
+++ b/src/Huxley/Controllers/ServiceController.cs
@@ -19,42 +19,27 @@ You should have received a copy of the GNU Affero General Public License
 */
 
 using System;
-using System.ServiceModel;
 using System.Threading.Tasks;
 using System.Web.Http;
 using Huxley.Models;
 using Huxley.ldbServiceReference;
 
 namespace Huxley.Controllers {
-    public class ServiceController : BaseController {
+    public class ServiceController : LdbController {
+
+        public ServiceController(ILdbClient client)
+            : base(client) {
+        }
+
         // GET /service/ID?accessToken=[your token]
         public async Task<ServiceDetails> Get([FromUri] ServiceRequest request) {
-
             Guid sid;
             if (Guid.TryParse(request.ServiceId, out sid)) {
                 request.ServiceId = Convert.ToBase64String(sid.ToByteArray());
             }
-
-            var client = new LDBServiceSoapClient();
-
-            // Avoiding Problems with the Using Statement in WCF clients
-            // https://msdn.microsoft.com/en-us/library/aa355056.aspx
-            try {
-                var token = MakeAccessToken(request.AccessToken);
-
-                var service = await client.GetServiceDetailsAsync(token, request.ServiceId);
-                return service.GetServiceDetailsResult;
-            } catch (CommunicationException) {
-                client.Abort();
-            } catch (TimeoutException) {
-                client.Abort();
-            } catch (Exception) {
-                client.Abort();
-                throw;
-            } finally {
-                client.Close();
-            }
-            return new ServiceDetails();
+            var token = MakeAccessToken(request.AccessToken);
+            var service = await Client.GetServiceDetailsAsync(token, request.ServiceId);
+            return service.GetServiceDetailsResult;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Huxley/Controllers/StationController.cs b/src/Huxley/Controllers/StationController.cs
index f761cac..096c272 100644
--- a/src/Huxley/Controllers/StationController.cs
+++ b/src/Huxley/Controllers/StationController.cs
@@ -18,15 +18,18 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-using System;
-using System.ServiceModel;
 using System.Threading.Tasks;
 using System.Web.Http;
 using Huxley.Models;
 using Huxley.ldbServiceReference;
 
 namespace Huxley.Controllers {
-    public class StationController : BaseController {
+    public class StationController : LdbController {
+
+        public StationController(ILdbClient client)
+            : base(client) {
+        }
+
         // GET /{board}/CRS?accessToken=[your token]
         public async Task<StationBoard> Get([FromUri] StationBoardRequest request) {
 
@@ -34,37 +37,21 @@ public async Task<StationBoard> Get([FromUri] StationBoardRequest request) {
             request.Crs = MakeCrsCode(request.Crs);
             request.FilterCrs = MakeCrsCode(request.FilterCrs);
 
-            var client = new LDBServiceSoapClient();
-
-            // Avoiding Problems with the Using Statement in WCF clients
-            // https://msdn.microsoft.com/en-us/library/aa355056.aspx
-            try {
-                var token = MakeAccessToken(request.AccessToken);
+            var token = MakeAccessToken(request.AccessToken);
 
-                if (Board.Departures == request.Board) {
-                    var departures = await client.GetDepartureBoardAsync(token, request.NumRows, request.Crs, request.FilterCrs, request.FilterType, 0, 0);
-                    return departures.GetStationBoardResult;
-                }
-                if (Board.Arrivals == request.Board) {
-                    var arrivals = await client.GetArrivalBoardAsync(token, request.NumRows, request.Crs, request.FilterCrs, request.FilterType, 0, 0);
-                    return arrivals.GetStationBoardResult;
-                }
-
-                // Default all (departures and arrivals board)
-                var board = await client.GetArrivalDepartureBoardAsync(token, request.NumRows, request.Crs, request.FilterCrs, request.FilterType, 0, 0);
-                return board.GetStationBoardResult;
+            if (Board.Departures == request.Board) {
+                var departures = await Client.GetDepartureBoardAsync(token, request.NumRows, request.Crs, request.FilterCrs, request.FilterType, 0, 0);
+                return departures.GetStationBoardResult;
+            }
 
-            } catch (CommunicationException) {
-                client.Abort();
-            } catch (TimeoutException) {
-                client.Abort();
-            } catch (Exception) {
-                client.Abort();
-                throw;
-            } finally {
-                client.Close();
+            if (Board.Arrivals == request.Board) {
+                var arrivals = await Client.GetArrivalBoardAsync(token, request.NumRows, request.Crs, request.FilterCrs, request.FilterType, 0, 0);
+                return arrivals.GetStationBoardResult;
             }
-            return new StationBoard();
+
+            // Default all (departures and arrivals board)
+            var board = await Client.GetArrivalDepartureBoardAsync(token, request.NumRows, request.Crs, request.FilterCrs, request.FilterType, 0, 0);
+            return board.GetStationBoardResult;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Huxley/Global.asax.cs b/src/Huxley/Global.asax.cs
index ca71002..0f72c5f 100644
--- a/src/Huxley/Global.asax.cs
+++ b/src/Huxley/Global.asax.cs
@@ -37,6 +37,9 @@ public class HuxleyApi : HttpApplication {
         // Singleton to store the station name to CRS lookup
         public static IList<CrsRecord> CrsCodes { get; private set; }
 
+        // Singleton to store the London Terminals CRS lookup
+        public static IList<CrsRecord> LondonTerminals { get; private set; }
+
         // Singleton to store the Huxley settings
         public static HuxleySettings Settings { get; private set; }
 
@@ -59,6 +62,29 @@ protected void Application_Start() {
 
             // Set the CRS dictionary passing in embedded CRS path
             CrsCodes = GetCrsCodes(Server.MapPath("~/RailReferences.csv")).Result;
+
+            // https://en.wikipedia.org/wiki/London_station_group 
+            // Farringdon [ZFD] is not a London Terminal but it probably should be (maybe when Crossrail opens it will be)
+            LondonTerminals = new List<CrsRecord> {
+                new CrsRecord {CrsCode = "BFR", StationName = "London Blackfriars",},
+                new CrsRecord {CrsCode = "CST", StationName = "London Cannon Street",},
+                new CrsRecord {CrsCode = "CHX", StationName = "London Charing Cross",},
+                new CrsRecord {CrsCode = "CTX", StationName = "City Thameslink",},
+                new CrsRecord {CrsCode = "EUS", StationName = "London Euston",},
+                new CrsRecord {CrsCode = "FST", StationName = "London Fenchurch Street",},
+                new CrsRecord {CrsCode = "KGX", StationName = "London Kings Cross",},
+                new CrsRecord {CrsCode = "LST", StationName = "London Liverpool Street",},
+                new CrsRecord {CrsCode = "LBG", StationName = "London Bridge",},
+                new CrsRecord {CrsCode = "MYB", StationName = "London Marylebone",},
+                new CrsRecord {CrsCode = "MOG", StationName = "Moorgate",},
+                new CrsRecord {CrsCode = "OLD", StationName = "Old Street",},
+                new CrsRecord {CrsCode = "PAD", StationName = "London Paddington",},
+                new CrsRecord {CrsCode = "STP", StationName = "London St Pancras International",},
+                new CrsRecord {CrsCode = "VXH", StationName = "Vauxhall",},
+                new CrsRecord {CrsCode = "VIC", StationName = "London Victoria",},
+                new CrsRecord {CrsCode = "WAT", StationName = "London Waterloo",},
+                new CrsRecord {CrsCode = "WAE", StationName = "London Waterloo East",},
+            };
         }
 
         protected void Application_BeginRequest(object sender, EventArgs e) {
diff --git a/src/Huxley/Huxley.csproj b/src/Huxley/Huxley.csproj
index 4316f94..b7ef8d7 100644
--- a/src/Huxley/Huxley.csproj
+++ b/src/Huxley/Huxley.csproj
@@ -50,10 +50,30 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
+    <Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.3.2.0.0\lib\net45-full\Ninject.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Ninject.Web.Common, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.Web.Common.3.2.0.0\lib\net45-full\Ninject.Web.Common.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Ninject.Web.WebApi, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.Web.WebApi.3.2.4.0\lib\net45-full\Ninject.Web.WebApi.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Ninject.Web.WebApi.WebHost, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ninject.Web.WebApi.WebHost.3.2.4.0\lib\net45-full\Ninject.Web.WebApi.WebHost.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.Entity" />
@@ -87,15 +107,22 @@
     </Reference>
     <Reference Include="System.Net.Http.WebRequest">
     </Reference>
+    <Reference Include="WebActivatorEx, Version=2.0.0.0, Culture=neutral, PublicKeyToken=7b26dc2a43f6a0d4, processorArchitecture=MSIL">
+      <HintPath>..\packages\WebActivatorEx.2.0\lib\net40\WebActivatorEx.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="App_Start\NinjectWebCommon.cs" />
     <Compile Include="Controllers\CrsController.cs" />
     <Compile Include="Controllers\DelaysController.cs" />
     <Compile Include="Controllers\StationController.cs" />
-    <Compile Include="Controllers\BaseController.cs" />
+    <Compile Include="Controllers\LdbController.cs" />
     <Compile Include="Controllers\ServiceController.cs" />
     <Compile Include="CrsRecord.cs" />
     <Compile Include="HuxleySettings.cs" />
+    <Compile Include="ILdbClient.cs" />
+    <Compile Include="LdbClient.cs" />
     <Compile Include="Models\BaseRequest.cs" />
     <Compile Include="Models\Board.cs" />
     <Compile Include="Models\DelaysResponse.cs" />
@@ -114,9 +141,35 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="android-icon-144x144.png" />
+    <Content Include="android-icon-192x192.png" />
+    <Content Include="android-icon-36x36.png" />
+    <Content Include="android-icon-48x48.png" />
+    <Content Include="android-icon-72x72.png" />
+    <Content Include="android-icon-96x96.png" />
+    <Content Include="apple-icon-114x114.png" />
+    <Content Include="apple-icon-120x120.png" />
+    <Content Include="apple-icon-144x144.png" />
+    <Content Include="apple-icon-152x152.png" />
+    <Content Include="apple-icon-180x180.png" />
+    <Content Include="apple-icon-57x57.png" />
+    <Content Include="apple-icon-60x60.png" />
+    <Content Include="apple-icon-72x72.png" />
+    <Content Include="apple-icon-76x76.png" />
+    <Content Include="apple-icon-precomposed.png" />
+    <Content Include="apple-icon.png" />
+    <Content Include="browserconfig.xml" />
+    <Content Include="favicon-16x16.png" />
+    <Content Include="favicon-32x32.png" />
+    <Content Include="favicon-96x96.png" />
+    <Content Include="favicon.ico" />
     <Content Include="Global.asax" />
     <Content Include="huxley.png" />
     <Content Include="index.html" />
+    <Content Include="ms-icon-144x144.png" />
+    <Content Include="ms-icon-150x150.png" />
+    <Content Include="ms-icon-310x310.png" />
+    <Content Include="ms-icon-70x70.png" />
     <Content Include="NRE_Powered_logo.png" />
     <Content Include="Service References\ldbServiceReference\configuration91.svcinfo" />
     <Content Include="Service References\ldbServiceReference\configuration.svcinfo" />
@@ -147,6 +200,7 @@
     </Content>
     <Content Include="Service References\ldbServiceReference\darwin_token_types_2013-11-28.wsdl" />
     <Content Include="RailReferences.csv" />
+    <Content Include="manifest.json" />
     <None Include="Service References\ldbServiceReference\darwin_token_types_2013-11-28.xsd">
       <SubType>Designer</SubType>
     </None>
diff --git a/src/Huxley/ILdbClient.cs b/src/Huxley/ILdbClient.cs
new file mode 100644
index 0000000..d8843e5
--- /dev/null
+++ b/src/Huxley/ILdbClient.cs
@@ -0,0 +1,31 @@
+/*
+Huxley - a JSON proxy for the UK National Rail Live Departure Board SOAP API
+Copyright (C) 2015 James Singleton
+ * http://huxley.unop.uk
+ * https://github.com/jpsingleton/Huxley
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System.Threading.Tasks;
+using Huxley.ldbServiceReference;
+
+namespace Huxley {
+    public interface ILdbClient {
+        Task<GetDepartureBoardResponse> GetDepartureBoardAsync(AccessToken accessToken, ushort numRows, string crs, string filterCrs, FilterType filterType, int timeOffset, int timeWindow);
+        Task<GetArrivalBoardResponse> GetArrivalBoardAsync(AccessToken accessToken, ushort numRows, string crs, string filterCrs, FilterType filterType, int timeOffset, int timeWindow);
+        Task<GetArrivalDepartureBoardResponse> GetArrivalDepartureBoardAsync(AccessToken accessToken, ushort numRows, string crs, string filterCrs, FilterType filterType, int timeOffset, int timeWindow);
+        Task<GetServiceDetailsResponse> GetServiceDetailsAsync(AccessToken accessToken, string serviceId);
+    }
+}
diff --git a/src/Huxley/LdbClient.cs b/src/Huxley/LdbClient.cs
new file mode 100644
index 0000000..964dbb3
--- /dev/null
+++ b/src/Huxley/LdbClient.cs
@@ -0,0 +1,66 @@
+/*
+Huxley - a JSON proxy for the UK National Rail Live Departure Board SOAP API
+Copyright (C) 2015 James Singleton
+ * http://huxley.unop.uk
+ * https://github.com/jpsingleton/Huxley
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+using System;
+using System.Threading.Tasks;
+using Huxley.ldbServiceReference;
+
+namespace Huxley {
+    public class LdbClient : ILdbClient {
+
+        private readonly LDBServiceSoapClient client;
+
+        public LdbClient(LDBServiceSoapClient client) {
+            this.client = client;
+        }
+
+        public async Task<GetDepartureBoardResponse> GetDepartureBoardAsync(AccessToken accessToken, ushort numRows, string crs, string filterCrs,
+                                                                              FilterType filterType, int timeOffset, int timeWindow) {
+            return await Execute(() => client.GetDepartureBoardAsync(accessToken, numRows, crs, filterCrs, filterType, timeOffset, timeWindow));
+
+        }
+
+        public async Task<GetArrivalBoardResponse> GetArrivalBoardAsync(AccessToken accessToken, ushort numRows, string crs, string filterCrs,
+                                                                          FilterType filterType, int timeOffset, int timeWindow) {
+            return await Execute(() => client.GetArrivalBoardAsync(accessToken, numRows, crs, filterCrs, filterType, timeOffset, timeWindow));
+        }
+
+        public async Task<GetArrivalDepartureBoardResponse> GetArrivalDepartureBoardAsync(AccessToken accessToken, ushort numRows, string crs, string filterCrs,
+                                                                                            FilterType filterType, int timeOffset, int timeWindow) {
+            return await Execute(() => client.GetArrivalDepartureBoardAsync(accessToken, numRows, crs, filterCrs, filterType, timeOffset, timeWindow));
+        }
+
+        public async Task<GetServiceDetailsResponse> GetServiceDetailsAsync(AccessToken accessToken, string serviceId) {
+            return await Execute(() => client.GetServiceDetailsAsync(accessToken, serviceId));
+        }
+
+        private T Execute<T>(Func<T> func) {
+            // Avoiding Problems with the Using Statement in WCF clients
+            try {
+                return func();
+            } catch (Exception) {
+                client.Abort();
+                throw;
+            } finally {
+                client.Close();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Huxley/Properties/AssemblyInfo.cs b/src/Huxley/Properties/AssemblyInfo.cs
index 2930384..57deecc 100644
--- a/src/Huxley/Properties/AssemblyInfo.cs
+++ b/src/Huxley/Properties/AssemblyInfo.cs
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
\ No newline at end of file
diff --git a/src/Huxley/Web.config b/src/Huxley/Web.config
index 263bfdf..110002d 100644
--- a/src/Huxley/Web.config
+++ b/src/Huxley/Web.config
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 Huxley - a JSON proxy for the UK National Rail Live Departure Board SOAP API
 Copyright (C) 2015 James Singleton
@@ -85,6 +85,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http.WebHost" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.serviceModel>
diff --git a/src/Huxley/android-icon-144x144.png b/src/Huxley/android-icon-144x144.png
new file mode 100644
index 0000000..4e0eb11
Binary files /dev/null and b/src/Huxley/android-icon-144x144.png differ
diff --git a/src/Huxley/android-icon-192x192.png b/src/Huxley/android-icon-192x192.png
new file mode 100644
index 0000000..1a686ff
Binary files /dev/null and b/src/Huxley/android-icon-192x192.png differ
diff --git a/src/Huxley/android-icon-36x36.png b/src/Huxley/android-icon-36x36.png
new file mode 100644
index 0000000..4704b55
Binary files /dev/null and b/src/Huxley/android-icon-36x36.png differ
diff --git a/src/Huxley/android-icon-48x48.png b/src/Huxley/android-icon-48x48.png
new file mode 100644
index 0000000..1d39be4
Binary files /dev/null and b/src/Huxley/android-icon-48x48.png differ
diff --git a/src/Huxley/android-icon-72x72.png b/src/Huxley/android-icon-72x72.png
new file mode 100644
index 0000000..c171b41
Binary files /dev/null and b/src/Huxley/android-icon-72x72.png differ
diff --git a/src/Huxley/android-icon-96x96.png b/src/Huxley/android-icon-96x96.png
new file mode 100644
index 0000000..e8e0c81
Binary files /dev/null and b/src/Huxley/android-icon-96x96.png differ
diff --git a/src/Huxley/apple-icon-114x114.png b/src/Huxley/apple-icon-114x114.png
new file mode 100644
index 0000000..1a82dde
Binary files /dev/null and b/src/Huxley/apple-icon-114x114.png differ
diff --git a/src/Huxley/apple-icon-120x120.png b/src/Huxley/apple-icon-120x120.png
new file mode 100644
index 0000000..9037e11
Binary files /dev/null and b/src/Huxley/apple-icon-120x120.png differ
diff --git a/src/Huxley/apple-icon-144x144.png b/src/Huxley/apple-icon-144x144.png
new file mode 100644
index 0000000..4e0eb11
Binary files /dev/null and b/src/Huxley/apple-icon-144x144.png differ
diff --git a/src/Huxley/apple-icon-152x152.png b/src/Huxley/apple-icon-152x152.png
new file mode 100644
index 0000000..066f91e
Binary files /dev/null and b/src/Huxley/apple-icon-152x152.png differ
diff --git a/src/Huxley/apple-icon-180x180.png b/src/Huxley/apple-icon-180x180.png
new file mode 100644
index 0000000..363790d
Binary files /dev/null and b/src/Huxley/apple-icon-180x180.png differ
diff --git a/src/Huxley/apple-icon-57x57.png b/src/Huxley/apple-icon-57x57.png
new file mode 100644
index 0000000..120b825
Binary files /dev/null and b/src/Huxley/apple-icon-57x57.png differ
diff --git a/src/Huxley/apple-icon-60x60.png b/src/Huxley/apple-icon-60x60.png
new file mode 100644
index 0000000..b815296
Binary files /dev/null and b/src/Huxley/apple-icon-60x60.png differ
diff --git a/src/Huxley/apple-icon-72x72.png b/src/Huxley/apple-icon-72x72.png
new file mode 100644
index 0000000..c171b41
Binary files /dev/null and b/src/Huxley/apple-icon-72x72.png differ
diff --git a/src/Huxley/apple-icon-76x76.png b/src/Huxley/apple-icon-76x76.png
new file mode 100644
index 0000000..a799da6
Binary files /dev/null and b/src/Huxley/apple-icon-76x76.png differ
diff --git a/src/Huxley/apple-icon-precomposed.png b/src/Huxley/apple-icon-precomposed.png
new file mode 100644
index 0000000..a385ff7
Binary files /dev/null and b/src/Huxley/apple-icon-precomposed.png differ
diff --git a/src/Huxley/apple-icon.png b/src/Huxley/apple-icon.png
new file mode 100644
index 0000000..a385ff7
Binary files /dev/null and b/src/Huxley/apple-icon.png differ
diff --git a/src/Huxley/browserconfig.xml b/src/Huxley/browserconfig.xml
new file mode 100644
index 0000000..c554148
--- /dev/null
+++ b/src/Huxley/browserconfig.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
\ No newline at end of file
diff --git a/src/Huxley/favicon-16x16.png b/src/Huxley/favicon-16x16.png
new file mode 100644
index 0000000..00377c9
Binary files /dev/null and b/src/Huxley/favicon-16x16.png differ
diff --git a/src/Huxley/favicon-32x32.png b/src/Huxley/favicon-32x32.png
new file mode 100644
index 0000000..5bd5114
Binary files /dev/null and b/src/Huxley/favicon-32x32.png differ
diff --git a/src/Huxley/favicon-96x96.png b/src/Huxley/favicon-96x96.png
new file mode 100644
index 0000000..e8e0c81
Binary files /dev/null and b/src/Huxley/favicon-96x96.png differ
diff --git a/src/Huxley/favicon.ico b/src/Huxley/favicon.ico
new file mode 100644
index 0000000..3100134
Binary files /dev/null and b/src/Huxley/favicon.ico differ
diff --git a/src/Huxley/index.html b/src/Huxley/index.html
index 26e683a..480da8f 100644
--- a/src/Huxley/index.html
+++ b/src/Huxley/index.html
@@ -22,6 +22,23 @@
 <head>
     <title>Huxley</title>
     <link href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192" href="/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/manifest.json">
+    <meta name="msapplication-TileColor" content="#ffffff">
+    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
+    <meta name="theme-color" content="#ffffff">
 </head>
 <body>
     <div class="container">
@@ -136,7 +153,7 @@ <h4>Delays</h4>
 }
 </pre>
         <p>
-            Additionally, this action will accept <code>LON</code> or <code>London</code> as a filter CRS to find trains going to or coming from any London terminal.
+            Additionally, this action will accept <code>LON</code> or <code>London</code> as a filter CRS to find trains going to or coming from any of the <a href="http://www.nationalrail.co.uk/times_fares/ticket_types/46587.aspx#terminals">London Terminals</a>.
         </p>
         <p>
             You can also pass in a comma separated list of 24 hour train times to filter on (e.g. <code>/delays/btn/to/lon/50/0729,0744,0748</code>).
@@ -161,6 +178,83 @@ <h4>CRS Station Codes</h4>
     "crsCode": "LZB"
   }
 ]
+</pre>
+        <p><code><a href="/crs/london terminals">/crs/london terminals</a></code> returns all codes in the <a href="https://en.wikipedia.org/wiki/London_station_group">London station group</a>.</p>
+        <pre>
+[
+  {
+    "stationName": "London Blackfriars",
+    "crsCode": "BFR"
+  },
+  {
+    "stationName": "London Cannon Street",
+    "crsCode": "CST"
+  },
+  {
+    "stationName": "London Charing Cross",
+    "crsCode": "CHX"
+  },
+  {
+    "stationName": "City Thameslink",
+    "crsCode": "CTX"
+  },
+  {
+    "stationName": "London Euston",
+    "crsCode": "EUS"
+  },
+  {
+    "stationName": "London Fenchurch Street",
+    "crsCode": "FST"
+  },
+  {
+    "stationName": "London Kings Cross",
+    "crsCode": "KGX"
+  },
+  {
+    "stationName": "London Liverpool Street",
+    "crsCode": "LST"
+  },
+  {
+    "stationName": "London Bridge",
+    "crsCode": "LBG"
+  },
+  {
+    "stationName": "London Marylebone",
+    "crsCode": "MYB"
+  },
+  {
+    "stationName": "Moorgate",
+    "crsCode": "MOG"
+  },
+  {
+    "stationName": "Old Street",
+    "crsCode": "OLD"
+  },
+  {
+    "stationName": "London Paddington",
+    "crsCode": "PAD"
+  },
+  {
+    "stationName": "London St Pancras International",
+    "crsCode": "STP"
+  },
+  {
+    "stationName": "Vauxhall",
+    "crsCode": "VXH"
+  },
+  {
+    "stationName": "London Victoria",
+    "crsCode": "VIC"
+  },
+  {
+    "stationName": "London Waterloo",
+    "crsCode": "WAT"
+  },
+  {
+    "stationName": "London Waterloo East",
+    "crsCode": "WAE"
+  }
+]
 </pre>
         <h3>Service</h3>
         <p><code><a href="/service/Z/zlpIG8jJacKayAnOXODw==?accessToken=">/service/[Service ID]?accessToken=[Your GUID token]</a></code></p>
diff --git a/src/Huxley/manifest.json b/src/Huxley/manifest.json
new file mode 100644
index 0000000..013d4a6
--- /dev/null
+++ b/src/Huxley/manifest.json
@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}
\ No newline at end of file
diff --git a/src/Huxley/ms-icon-144x144.png b/src/Huxley/ms-icon-144x144.png
new file mode 100644
index 0000000..4e0eb11
Binary files /dev/null and b/src/Huxley/ms-icon-144x144.png differ
diff --git a/src/Huxley/ms-icon-150x150.png b/src/Huxley/ms-icon-150x150.png
new file mode 100644
index 0000000..b16e1c1
Binary files /dev/null and b/src/Huxley/ms-icon-150x150.png differ
diff --git a/src/Huxley/ms-icon-310x310.png b/src/Huxley/ms-icon-310x310.png
new file mode 100644
index 0000000..efb29ed
Binary files /dev/null and b/src/Huxley/ms-icon-310x310.png differ
diff --git a/src/Huxley/ms-icon-70x70.png b/src/Huxley/ms-icon-70x70.png
new file mode 100644
index 0000000..7827b7f
Binary files /dev/null and b/src/Huxley/ms-icon-70x70.png differ
diff --git a/src/Huxley/packages.config b/src/Huxley/packages.config
index e78cb54..80eb758 100644
--- a/src/Huxley/packages.config
+++ b/src/Huxley/packages.config
@@ -6,5 +6,12 @@
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
+  <package id="Ninject" version="3.2.0.0" targetFramework="net45" />
+  <package id="Ninject.Web.Common" version="3.2.0.0" targetFramework="net45" />
+  <package id="Ninject.Web.Common.WebHost" version="3.2.0.0" targetFramework="net45" />
+  <package id="Ninject.Web.WebApi" version="3.2.4.0" targetFramework="net45" />
+  <package id="Ninject.Web.WebApi.WebHost" version="3.2.4.0" targetFramework="net45" />
+  <package id="WebActivatorEx" version="2.0" targetFramework="net45" />
 </packages>
\ No newline at end of file