diff --git a/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs b/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs
index a045fde..508a4d1 100644
--- a/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs
+++ b/DataCenter_Windows/WindowsDataCenter/CardReaderService/Configuration.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using CardReaderService.DefaultComponents;
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
index e54d778..7d38816 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
@@ -3,6 +3,7 @@
   <appSettings>
     <add key="NLogConfigFilePath" value="Configs/NLogConfig.xml" />
     <add key="DefaultPageSize" value="20" />
+    <add key="WebsiteHttpPort" value="8800"/>
     <add key="SwipeTimeGap" value="3" />
     <add key="BugSubmissionEmailAddress" value="incoming+WattsC/FlexiTimeTrackerTool+24qrefn8e1urhl4iqct7we2jl@gitlab.com"/>
   </appSettings>
diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DataCenterService.cs b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DataCenterService.cs
index 8acb365..b3c551b 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DataCenterService.cs
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/DataCenterService.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Configuration;
+using System.IO;
+using System.Reflection;
 using System.ServiceProcess;
 using System.Threading;
 using Interfaces;
@@ -31,6 +34,12 @@ namespace WindowsDataCenter
         protected override void OnStart(string[] args)
         {
             var configPath = string.Concat(System.Reflection.Assembly.GetEntryAssembly().Location, ".config");
+            //var configsDir = new Uri(Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), "configs")).LocalPath;
+            //var exeName = Assembly.GetEntryAssembly().ManifestModule.ScopeName;
+            //var appConfigPath = Path.Combine(configsDir, string.Format("{0}.config", exeName));
+            //AppDomain.CurrentDomain.SetData("APP_CONFIG_FILE", appConfigPath);
+            //var val = ConfigurationManager.AppSettings["TEST"];
+
             //Initialise the Ninject system.
             var ninjectInstance = NinjectHelper.GetInstance();
             _logger = NinjectHelper.GetInstance().Get<ILogger>();
@@ -42,10 +51,12 @@ namespace WindowsDataCenter
                 IsBackground = false,
                 Name = "OWIN SELF HOST MAIN THREAD"
             };
-            //TODO: use app.config for endpoint config.
+
+            var endpointPort = ConfigurationManager.AppSettings["WebsiteHttpPort"] ?? "8800";
             try
             {
-                _webApp = WebApp.Start<StartOwin>("http://*:8800");
+                var endpoint = string.Format("http://*:{0}", endpointPort);
+                _webApp = WebApp.Start<StartOwin>(endpoint);
             }
             catch (Exception ex)
             {