From b9a2709fd54e3d22343f676598abcb00f70234b1 Mon Sep 17 00:00:00 2001
From: James Kolpack <james.kolpack@gmail.com>
Date: Sat, 11 Oct 2025 09:44:08 -0400
Subject: [PATCH] Configuration branch

---
 Endpoint/Endpoint.csproj                      |  58 +-
 Endpoint/HtmlEndpoint.cs                      |  72 ++-
 Endpoint/HtmlEndpointConfiguration.cs         | 114 ++++
 Endpoint/HttpEndpoint.cs                      | 114 ++--
 Endpoint/HttpEndpointConfiguration.cs         | 128 +++++
 Endpoint/IHttpEndpointConfiguration.cs        |  18 +
 Endpoint/IServiceEndpoint.cs                  |  31 ++
 Endpoint/IServiceEndpointConfiguration.cs     |  11 +
 Endpoint/OracleEndpoint.cs                    |  60 +++
 Endpoint/OracleEndpointConfiguration.cs       | 155 ++++++
 Endpoint/ServiceEndpointFactory.cs            |  31 ++
 Endpoint/SoapEndpoint.cs                      |  75 +--
 Endpoint/SoapEndpointConfiguration.cs         | 134 +++++
 Endpoint/Status.cs                            |   8 +-
 EndpointTest/EndpointTest.csproj              |  50 +-
 EndpointTest/HtmlEndpointTest.cs              |  48 +-
 EndpointTest/HttpEndpointTest.cs              |  54 +-
 ServiceDashBored.sln                          |  15 +-
 ServiceDashBored/EndpointStatus.cs            | 132 ++---
 ServiceDashBored/Main.Designer.cs             | 211 ++++----
 ServiceDashBored/Main.cs                      | 506 ++++++------------
 ServiceDashBored/Main.resx                    |  22 +-
 ServiceDashBored/Program.cs                   |  29 +-
 .../Properties/Resources.Designer.cs          |  23 +-
 ServiceDashBored/Properties/Resources.resx    |   4 +-
 .../Properties/Settings.Designer.cs           |  37 ++
 ServiceDashBored/Properties/Settings.settings |   9 +
 ServiceDashBored/Resources/help.ico           | Bin 0 -> 68790 bytes
 ServiceDashBored/ServiceDashBored.csproj      |  67 +--
 ServiceDashBored/Settings.cs                  |  28 +
 ServiceDashBored/app.config                   | 180 +------
 31 files changed, 1367 insertions(+), 1057 deletions(-)
 create mode 100644 Endpoint/HtmlEndpointConfiguration.cs
 create mode 100644 Endpoint/HttpEndpointConfiguration.cs
 create mode 100644 Endpoint/IHttpEndpointConfiguration.cs
 create mode 100644 Endpoint/IServiceEndpoint.cs
 create mode 100644 Endpoint/IServiceEndpointConfiguration.cs
 create mode 100644 Endpoint/OracleEndpoint.cs
 create mode 100644 Endpoint/OracleEndpointConfiguration.cs
 create mode 100644 Endpoint/ServiceEndpointFactory.cs
 create mode 100644 Endpoint/SoapEndpointConfiguration.cs
 create mode 100644 ServiceDashBored/Properties/Settings.Designer.cs
 create mode 100644 ServiceDashBored/Properties/Settings.settings
 create mode 100644 ServiceDashBored/Resources/help.ico
 create mode 100644 ServiceDashBored/Settings.cs

diff --git a/Endpoint/Endpoint.csproj b/Endpoint/Endpoint.csproj
index a86a8cb..a4524de 100644
--- a/Endpoint/Endpoint.csproj
+++ b/Endpoint/Endpoint.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,23 +14,9 @@
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,7 +26,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -49,51 +34,40 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HtmlAgilityPack, Version=1.3.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\HtmlAgilityPack.dll</HintPath>
     </Reference>
+    <Reference Include="Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>References\Oracle.DataAccess.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.ServiceProcess" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="HtmlEndpoint.cs" />
-    <Compile Include="IEndpoint.cs" />
+    <Compile Include="HtmlEndpointConfiguration.cs" />
+    <Compile Include="HttpEndpointConfiguration.cs" />
+    <Compile Include="IHttpEndpointConfiguration.cs" />
+    <Compile Include="OracleEndpoint.cs" />
+    <Compile Include="OracleEndpointConfiguration.cs" />
+    <Compile Include="IServiceEndpointConfiguration.cs" />
     <Compile Include="HttpEndpoint.cs" />
+    <Compile Include="IServiceEndpoint.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ServiceEndpointFactory.cs" />
+    <Compile Include="SoapEndpointConfiguration.cs" />
     <Compile Include="SoapEndpoint.cs" />
     <Compile Include="Status.cs" />
-    <Compile Include="StatusComparer.cs" />
-    <Compile Include="WindowsServiceEndpoint.cs" />
-    <Compile Include="WmiEndpoint.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Endpoint/HtmlEndpoint.cs b/Endpoint/HtmlEndpoint.cs
index a8254a5..d03bb9f 100644
--- a/Endpoint/HtmlEndpoint.cs
+++ b/Endpoint/HtmlEndpoint.cs
@@ -6,36 +6,15 @@ using HtmlAgilityPack;
 
 namespace Endpoint
 {
-	/// <summary>
-	/// A website endpoint
-	/// </summary>
 	public class HtmlEndpoint : HttpEndpoint
 	{
 		/// <summary>
-		/// Gets or sets the xpath query for the html document
-		/// </summary>
-		/// <value>The xpath query.</value>
-		public string XpathQuery { get; set; }
-
-		/// <summary>
-		/// Gets or sets the expected query results.
-		/// </summary>
-		/// <value>The expected query results.</value>
-		public string ExpectedXpathResult { get; set; }
-
-		/// <summary>
-		/// Gets or sets the post.
-		/// </summary>
-		/// <value>The post.</value>
-		public string RequestContent { get; set; }
-
-		/// <summary>
-		/// Returns the HTML parsed into a standard <see cref="XmlDocument"/>.
-		/// Uses the <see cref="HtmlAgilityPack"/> library for "out of the web" (poorly formatted) html file support.
+		/// Returns the HTML parsed into a standard XmlDocument.
+		/// Uses the HtmlAgilityPack library for "out of the web" (poorly formatted) html file support.
 		/// </summary>
 		/// <param name="html">The HTML</param>
-		/// <returns>An <see cref="XmlDocument"/> from the HTML</returns>
-		private static XmlDocument getHtmlXml(string html)
+		/// <returns>An XmlDocument from the HTML</returns>
+		private static XmlDocument GetHtmlXml(string html)
 		{
 			var htmlDocument = new HtmlDocument();
 			htmlDocument.LoadHtml(html);
@@ -58,15 +37,34 @@ namespace Endpoint
 		}
 
 		/// <summary>
-		/// Returns the HTML grabbed from the passed in URL parsed into a standard <see cref="XmlDocument"/>.
-		/// Uses the <see cref="HtmlAgilityPack"/> library for "out of the web" html file support.
+		/// Returns the HTML grabbed from the passed in URL parsed into a standard XmlDocument.
+		/// Uses the HtmlAgilityPack library for "out of the web" html file support.
 		/// </summary>
 		/// <param name="url">The URL.</param>
 		/// <param name="requestContent">The post data.</param>
-		/// <returns>An <see cref="XmlDocument"/> from the HTML</returns>
-		private static XmlDocument getHtmlXml(Uri url, string requestContent)
+		/// <returns>An XmlDocument from the HTML</returns>
+		private static XmlDocument GetHtmlXml(Uri url, string requestContent)
+		{
+			return GetHtmlXml(GetUrlContent(url, "application/x-www-form-urlencoded", requestContent, null));
+		}
+
+
+		/// <summary>
+		/// Gets the HTTP endpoint configuration.
+		/// </summary>
+		/// <value>The HTTP endpoint configuration.</value>
+		public HtmlEndpointConfiguration HtmlEndpointConfiguration
+		{
+			get { return (HtmlEndpointConfiguration)_httpEndpointConfiguration; }
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="HttpEndpoint"/> class.
+		/// </summary>
+		/// <param name="config">The HttpEndpointConfiguration.</param>
+		public HtmlEndpoint(HtmlEndpointConfiguration config)
+			: base(config)
 		{
-			return getHtmlXml(GetUrlContent(url, "application/x-www-form-urlencoded", requestContent, null));
 		}
 
 		/// <summary>
@@ -75,29 +73,29 @@ namespace Endpoint
 		/// <returns>Status</returns>
 		public override Status GetStatus()
 		{
-			var baseStatus = base.GetStatus();
+			Status baseStatus = base.GetStatus();
 			if (baseStatus != Status.Up)
 				return baseStatus;
 
 			try
 			{
-				var xml = getHtmlXml(Uri, RequestContent);
+				XmlDocument xml = GetHtmlXml(HttpEndpointConfiguration.Uri, HtmlEndpointConfiguration.RequestContent);
 
 				// xml.Save(@"c:\test.xml");
 
-				var nodes = xml.SelectNodes(XpathQuery);
-
+				XmlNodeList nodes = xml.SelectNodes(HtmlEndpointConfiguration.XpathQuery);
+				
 				// verify html has expected value
 				if (nodes == null || nodes.Count == 0)
 				{
 					StatusDescription = "Couldn't find expected value in html";
 					return Status.Error;
 				}
-				var value = nodes[0].Value.Trim();
-				if (value != ExpectedXpathResult)
+				string value = nodes[0].Value.Trim();
+				if (value != HtmlEndpointConfiguration.ExpectedXpathResult)
 				{
 					StatusDescription = String.Format("Result was: '{0}', was expecting '{1}'", value,
-					                                  ExpectedXpathResult);
+								  HtmlEndpointConfiguration.ExpectedXpathResult);
 					return Status.Error;
 				}
 			}
diff --git a/Endpoint/HtmlEndpointConfiguration.cs b/Endpoint/HtmlEndpointConfiguration.cs
new file mode 100644
index 0000000..5f76aef
--- /dev/null
+++ b/Endpoint/HtmlEndpointConfiguration.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Configuration;
+using System.Xml.Serialization;
+
+namespace Endpoint
+{
+	/// <summary>
+	/// Defines a configuration for an html webpage endpoint
+	/// </summary>
+	public class HtmlEndpointConfiguration : ConfigurationElement, IHttpEndpointConfiguration
+	{
+		/// <summary>
+		/// Gets or sets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		[ConfigurationProperty("name", DefaultValue = "", IsKey = true, IsRequired = true)]
+		public string Name
+		{
+			get { return (string)base["name"]; }
+			set { base["name"] = value; }
+		}
+
+		/// <summary>
+		/// URI of the service
+		/// </summary>
+		[XmlIgnore]
+		public Uri Uri
+		{
+			get { return new Uri(UriString); }
+		}
+
+		/// <summary>
+		/// Gets or sets the URI string.
+		/// </summary>
+		/// <value>The URI string.</value>
+		[ConfigurationProperty("uri", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string UriString
+		{
+			get { return (string)base["uri"]; }
+			set { base["uri"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the xpath query for the html document
+		/// </summary>
+		/// <value>The xpath query.</value>
+		[ConfigurationProperty("xpathQuery", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string XpathQuery
+		{
+			get { return (string)base["xpathQuery"]; }
+			set { base["xpathQuery"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the expected query results.
+		/// </summary>
+		/// <value>The expected query results.</value>
+		[ConfigurationProperty("expectedXpathResult", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string ExpectedXpathResult
+		{
+			get { return (string)base["expectedXpathResult"]; }
+			set { base["expectedXpathResult"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the post.
+		/// </summary>
+		/// <value>The post.</value>
+		[ConfigurationProperty("requestContent", DefaultValue = "", IsKey = false, IsRequired = false)]
+		public string RequestContent
+		{
+			get { return (string)base["requestContent"]; }
+			set { base["requestContent"] = value; }
+		}
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class HtmlEndpointConfigurationCollection : ConfigurationElementCollection
+	{
+		/// <summary>
+		/// When overridden in a derived class, creates a new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </summary>
+		/// <returns>
+		/// A new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new HtmlEndpointConfiguration();
+		}
+
+		/// <summary>
+		/// Gets the element key for a specified configuration element when overridden in a derived class.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="T:System.Object" /> that acts as the key for the specified <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		/// <param name="element">The <see cref="T:System.Configuration.ConfigurationElement" /> to return the key for. </param>
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((HtmlEndpointConfiguration)element).Name;
+		}
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class HtmlEndpointConfigurationSection : ConfigurationSection
+	{
+		[ConfigurationProperty("endpoints")]
+		public HtmlEndpointConfigurationCollection Endpoints { get { return (HtmlEndpointConfigurationCollection)(base["endpoints"]); } }
+	}
+}
diff --git a/Endpoint/HttpEndpoint.cs b/Endpoint/HttpEndpoint.cs
index 9bd5b99..6ea3c67 100644
--- a/Endpoint/HttpEndpoint.cs
+++ b/Endpoint/HttpEndpoint.cs
@@ -1,8 +1,8 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Text;
+using System.Collections.Generic;
 
 namespace Endpoint
 {
@@ -10,66 +10,50 @@ namespace Endpoint
 	/// Http Endpoint - such as a webserver, a webservice, etc
 	/// </summary>
 	[Serializable]
-	public class HttpEndpoint : IEndpoint
+	public class HttpEndpoint : IServiceEndpoint
 	{
-		/// <summary>
-		/// Gets or sets the name.
-		/// </summary>
-		/// <value>The name.</value>
-		public string Name { get; set; }
-
-		/// <summary>
-		/// URI of the service
-		/// </summary>
-		public Uri Uri { get; set; }
-
-		/// <summary>
-		/// Gets or sets the URI string.
-		/// </summary>
-		/// <value>The URI string.</value>
-		public string UriString
-		{
-			get { return Uri.ToString(); }
-			set { Uri = new Uri(value); }
-		}
-
 		/// <summary>
 		/// Returns the response string grabbed from the passed in URL.
 		/// </summary>
 		/// <param name="url">The URL.</param>
-		/// <param name="contentType">The HTTP content type.</param>
+		/// <param name="contentType">The HTTP contentType.</param>
 		/// <param name="requestContent">The request content.</param>
 		/// <param name="webHeaders">The web headers.</param>
 		/// <returns>A string containing response</returns>
-		protected static string GetUrlContent(Uri url, string contentType, string requestContent,
-		                                      Dictionary<string, string> webHeaders)
+		protected static string GetUrlContent(Uri url, string contentType, string requestContent, Dictionary<string,string> webHeaders)
 		{
 			// POST request
 			if (!string.IsNullOrEmpty(contentType) && !string.IsNullOrEmpty(requestContent))
 			{
-				var webRequest = (HttpWebRequest) WebRequest.Create(url);
+				HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
 
-				// NOTE: need a proxy?  Here's where it would go
+				// NOTE: proxy?
 				// webRequest.Proxy = new WebProxy();
 
 				// SOAP
 				webRequest.ContentType = contentType;
 				if (webHeaders != null && webHeaders.Count > 0)
-				{
-					foreach (var webHeader in webHeaders)
+					foreach (KeyValuePair<string, string> webHeader in webHeaders)
 						webRequest.Headers.Add(webHeader.Key, webHeader.Value);
-				}
+					
+
+				// NOTE: SOAPACtion
+				//webRequest.Headers.Add("SOAPAction", "\"urn:getPaymentKey\"");
+
+				// FORM
+				//webRequest.ContentType = "application/x-www-form-urlencoded";
 
 				webRequest.Method = "POST";
+				// webRequest.Accept = "text/xml";
 
 				//We need to count how many bytes we're sending. Post'ed Faked Forms should be name=value&
-				var bytes = Encoding.ASCII.GetBytes(requestContent);
+				byte[] bytes = Encoding.ASCII.GetBytes(requestContent);
 				webRequest.ContentLength = bytes.Length;
-				using (var requestStream = webRequest.GetRequestStream())
+				using (Stream requestStream = webRequest.GetRequestStream())
 				{
 					requestStream.Write(bytes, 0, bytes.Length); //write it to the stream
 				}
-				var webResponse = webRequest.GetResponse();
+				WebResponse webResponse = webRequest.GetResponse();
 				if (webResponse == null)
 					return null;
 				using (var streamReader = new StreamReader(webResponse.GetResponseStream()))
@@ -80,18 +64,46 @@ namespace Endpoint
 
 			// GET Request
 			var client = new WebClient();
-			using (var data = client.OpenRead(url))
+			using (Stream data = client.OpenRead(url))
 			using (var reader = new StreamReader(data))
 			{
 				return reader.ReadToEnd();
 			}
 		}
 
+		protected readonly IHttpEndpointConfiguration _httpEndpointConfiguration;
+		
 		/// <summary>
 		/// Returns a string explaining details on the current status
 		/// </summary>
 		/// <returns>string with status message</returns>
-		public virtual string StatusDescription { get; protected set; }
+		public virtual string StatusDescription
+		{
+			get; protected set;
+		}
+
+		public IServiceEndpointConfiguration ServiceEndpointConfiguration
+		{
+			get { return _httpEndpointConfiguration; }
+		}
+
+		/// <summary>
+		/// Gets the service name
+		/// </summary>
+		/// <value></value>
+		public string ServiceName
+		{
+			get { return _httpEndpointConfiguration.Name; }
+		}
+
+		/// <summary>
+		/// Gets the HTTP endpoint configuration.
+		/// </summary>
+		/// <value>The HTTP endpoint configuration.</value>
+		public IHttpEndpointConfiguration HttpEndpointConfiguration
+		{
+			get { return _httpEndpointConfiguration; }
+		}
 
 		/// <summary>
 		/// Gets the current status result of the endpoint
@@ -101,24 +113,36 @@ namespace Endpoint
 		{
 			try
 			{
-				var request = WebRequest.Create(Uri);
+				WebRequest request = WebRequest.Create(HttpEndpointConfiguration.Uri);
 
-				using (var response = (HttpWebResponse) request.GetResponse())
+				using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
 				{
 					StatusDescription = response.StatusDescription;
-					return response.StatusCode == HttpStatusCode.OK
-					       	? Status.Up
-					       	: Status.Unreachable;
+					if (response.StatusCode == HttpStatusCode.OK)
+						return Status.Up;
+					return Status.Unreachable;
 				}
 			}
 			catch (WebException ex)
 			{
 				StatusDescription = ex.Message + " (" + ex.Status + ")";
-
-				return ex.Status == WebExceptionStatus.Timeout
-				       	? Status.Timeout
-				       	: Status.Unreachable;
+				
+				// TODO: LOG
+				if (ex.Status == WebExceptionStatus.Timeout)
+				{
+					return Status.Timeout;
+				}
+				return Status.Unreachable;
 			}
 		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="HttpEndpoint"/> class.
+		/// </summary>
+		/// <param name="config">The HttpEndpointConfiguration.</param>
+		public HttpEndpoint(IHttpEndpointConfiguration config)
+		{
+			_httpEndpointConfiguration = config;
+		}
 	}
 }
diff --git a/Endpoint/HttpEndpointConfiguration.cs b/Endpoint/HttpEndpointConfiguration.cs
new file mode 100644
index 0000000..3c36fb7
--- /dev/null
+++ b/Endpoint/HttpEndpointConfiguration.cs
@@ -0,0 +1,128 @@
+using System;
+using System.Configuration;
+using System.Xml.Serialization;
+
+namespace Endpoint
+{
+	/// <summary>
+	/// Defines a configuration for an http service endpoint
+	/// </summary>
+	public class HttpEndpointConfiguration : ConfigurationElement, IHttpEndpointConfiguration
+	{
+		/// <summary>
+		/// Gets or sets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		[ConfigurationProperty("name", DefaultValue = "", IsKey = true, IsRequired = true)]
+		public string Name
+		{
+			get { return (string) base["name"]; }
+			set { base["name"] = value; }
+		}
+
+		/// <summary>
+		/// URI of the service
+		/// </summary>
+		[XmlIgnore]
+		public Uri Uri
+		{
+			get { return new Uri((string) base["uri"]); }
+		}
+
+		/// <summary>
+		/// Gets or sets the URI string.
+		/// </summary>
+		/// <value>The URI string.</value>
+		[ConfigurationProperty("uri", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string UriString
+		{
+			get { return (string)base["uri"]; }
+			set { base["uri"] = value; }
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="HttpEndpointConfiguration"/> class.
+		/// </summary>
+		/// <param name="serviceName">The name.</param>
+		/// <param name="uri">The uri.</param>
+		public HttpEndpointConfiguration(string serviceName, Uri uri)
+		{
+			Name = serviceName;
+			UriString = uri.OriginalString;
+		}
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpEndpointConfiguration"/> class.
+        /// </summary>
+        internal protected HttpEndpointConfiguration()
+        {
+        }
+
+		/// <summary>
+		/// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
+		/// </summary>
+		/// <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>.</param>
+		/// <returns>
+		/// true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false.
+		/// </returns>
+		/// <exception cref="T:System.NullReferenceException">The <paramref name="obj"/> parameter is null.</exception>
+		public override bool Equals(object obj)
+		{
+			HttpEndpointConfiguration value = obj as HttpEndpointConfiguration;
+			if (value == null)
+				return false;
+			if (value.Uri != Uri)
+				return false;
+			return true;
+		}
+
+		/// <summary>
+		/// Serves as a hash function for a particular type.
+		/// </summary>
+		/// <returns>
+		/// A hash code for the current <see cref="T:System.Object"/>.
+		/// </returns>
+		public override int GetHashCode()
+		{
+			return Uri.GetHashCode();
+		}
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class HttpEndpointConfigurationCollection  : ConfigurationElementCollection
+	{
+		/// <summary>
+		/// When overridden in a derived class, creates a new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </summary>
+		/// <returns>
+		/// A new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new HttpEndpointConfiguration();
+		}
+
+		/// <summary>
+		/// Gets the element key for a specified configuration element when overridden in a derived class.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="T:System.Object" /> that acts as the key for the specified <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		/// <param name="element">The <see cref="T:System.Configuration.ConfigurationElement" /> to return the key for. </param>
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((HttpEndpointConfiguration) element).Name;
+		}
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class HttpEndpointConfigurationSection : ConfigurationSection
+	{
+		[ConfigurationProperty("endpoints")]
+		public HttpEndpointConfigurationCollection Endpoints { get { return (HttpEndpointConfigurationCollection)(base["endpoints"]); } }
+	}
+}
diff --git a/Endpoint/IHttpEndpointConfiguration.cs b/Endpoint/IHttpEndpointConfiguration.cs
new file mode 100644
index 0000000..15bbe5c
--- /dev/null
+++ b/Endpoint/IHttpEndpointConfiguration.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Configuration;
+using System.Xml.Serialization;
+
+namespace Endpoint
+{
+	public interface IHttpEndpointConfiguration : IServiceEndpointConfiguration
+	{
+		/// <summary>
+		/// URI of the service
+		/// </summary>
+		[XmlIgnore]
+		Uri Uri { get; }
+
+		[ConfigurationProperty("uri", DefaultValue = "", IsKey = false, IsRequired = false)]
+		string UriString { get; set; }
+	}
+}
diff --git a/Endpoint/IServiceEndpoint.cs b/Endpoint/IServiceEndpoint.cs
new file mode 100644
index 0000000..1930158
--- /dev/null
+++ b/Endpoint/IServiceEndpoint.cs
@@ -0,0 +1,31 @@
+
+namespace Endpoint
+{
+	/// <summary>
+	/// Describes a service endpoint, and the methods to find its current status
+	/// </summary>
+	public interface IServiceEndpoint
+	{
+		/// <summary>
+		/// Configuration of the endpoint
+		/// </summary>
+		IServiceEndpointConfiguration ServiceEndpointConfiguration { get; }
+
+		/// <summary>
+		/// Gets the service name
+		/// </summary>
+		string ServiceName { get; }
+
+		/// <summary>
+		/// Gets the current status result of the endpoint
+		/// </summary>
+		/// <returns>Status</returns>
+		Status GetStatus();
+
+		/// <summary>
+		/// Returns a string explaining details on the current status
+		/// </summary>
+		/// <returns>string with status message</returns>
+		string StatusDescription { get; }
+	}
+}
diff --git a/Endpoint/IServiceEndpointConfiguration.cs b/Endpoint/IServiceEndpointConfiguration.cs
new file mode 100644
index 0000000..35400f5
--- /dev/null
+++ b/Endpoint/IServiceEndpointConfiguration.cs
@@ -0,0 +1,11 @@
+
+namespace Endpoint
+{
+	/// <summary>
+	/// Describes a service endpoint's configuration
+	/// </summary>
+	public interface IServiceEndpointConfiguration
+	{
+		string Name { get; set; }
+	}
+}
diff --git a/Endpoint/OracleEndpoint.cs b/Endpoint/OracleEndpoint.cs
new file mode 100644
index 0000000..f64d81b
--- /dev/null
+++ b/Endpoint/OracleEndpoint.cs
@@ -0,0 +1,60 @@
+using System;
+using Oracle.DataAccess.Client;
+
+namespace Endpoint
+{
+	public class OracleEndpoint : IServiceEndpoint
+	{
+		private readonly OracleEndpointConfiguration _serviceEndpointConfiguration;
+
+		public IServiceEndpointConfiguration ServiceEndpointConfiguration
+		{
+			get { return _serviceEndpointConfiguration; }
+		}
+
+		public string ServiceName
+		{
+			get { return _serviceEndpointConfiguration.Name; }
+		}
+
+		public string StatusDescription { get; private set; }
+
+		public Status GetStatus()
+		{
+			using (OracleConnection oracleConnection = new OracleConnection(_serviceEndpointConfiguration.ConnectionString))
+			using (OracleCommand oracleCommand = new OracleCommand(_serviceEndpointConfiguration.ScalarQueryString, oracleConnection))
+			{
+				try
+				{
+					oracleConnection.Open();
+					object result = oracleCommand.ExecuteScalar();
+					string resultString = result.ToString();
+					if (resultString != _serviceEndpointConfiguration.ExpectedQueryResult)
+					{
+						StatusDescription = String.Format("Result was: '{0}', was expecting '{1}'", resultString,
+						                                  _serviceEndpointConfiguration.ExpectedQueryResult);
+						return Status.Error;
+					}
+				}
+				catch(Exception ex)
+				{
+					StatusDescription = ex.Message;
+					return Status.Error;
+				}
+			}
+			StatusDescription = "OK";
+			return Status.Up;
+		}
+
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="OracleEndpoint"/> class.
+		/// </summary>
+		/// <param name="config">The config.</param>
+		public OracleEndpoint(OracleEndpointConfiguration config)
+		{
+			_serviceEndpointConfiguration = config;
+			StatusDescription = "";
+		}
+	}
+}
diff --git a/Endpoint/OracleEndpointConfiguration.cs b/Endpoint/OracleEndpointConfiguration.cs
new file mode 100644
index 0000000..2e90f3d
--- /dev/null
+++ b/Endpoint/OracleEndpointConfiguration.cs
@@ -0,0 +1,155 @@
+using System;
+using System.Configuration;
+
+namespace Endpoint
+{
+	/// <summary>
+	/// Defines a configuration for an oracle service endpoint
+	/// </summary>
+	public class OracleEndpointConfiguration : ConfigurationElement, IServiceEndpointConfiguration
+	{
+		/// <summary>
+		/// Gets or sets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		[ConfigurationProperty("name", DefaultValue = "", IsKey = true, IsRequired = true)]
+		public string Name
+		{
+			get { return (string)base["name"]; }
+			set { base["name"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the connection string.
+		/// </summary>
+		/// <value>The connection string.</value>
+		[ConfigurationProperty("connectionString", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string ConnectionString
+		{
+			get { return (string)base["connectionString"]; }
+			set { base["connectionString"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the connection string.
+		/// </summary>
+		/// <value>The connection string.</value>
+		[ConfigurationProperty("scalarQueryString", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string ScalarQueryString
+		{
+			get { return (string)base["scalarQueryString"]; }
+			set { base["scalarQueryString"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the connection string.
+		/// </summary>
+		/// <value>The connection string.</value>
+		[ConfigurationProperty("expectedQueryResult", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string ExpectedQueryResult
+		{
+			get { return (string)base["expectedQueryResult"]; }
+			set { base["expectedQueryResult"] = value; }
+		}
+		
+		/// <summary>
+		/// Initializes a new instance of the <see cref="OracleEndpointConfiguration"/> class.
+		/// </summary>
+		internal protected OracleEndpointConfiguration()
+		{}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="OracleEndpointConfiguration"/> class.
+		/// </summary>
+		/// <param name="serviceName">Name of the service.</param>
+		/// <param name="connectionString">The connection string.</param>
+		/// <param name="scalarQueryString">The scalar query string.</param>
+		/// <param name="expectedQueryResult">The expected query result.</param>
+		public OracleEndpointConfiguration(string serviceName, string connectionString, string scalarQueryString, string expectedQueryResult) 
+		{
+			if (serviceName == null)
+				throw new ArgumentNullException("serviceName");
+			if (connectionString == null)
+				throw new ArgumentNullException("connectionString");
+			if (scalarQueryString == null)
+				throw new ArgumentNullException("scalarQueryString");
+			if (expectedQueryResult == null)
+				throw new ArgumentNullException("expectedQueryResult");
+
+			ConnectionString = connectionString;
+			ScalarQueryString = scalarQueryString;
+			ExpectedQueryResult = expectedQueryResult;
+		}
+
+		/// <summary>
+		/// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
+		/// </summary>
+		/// <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>.</param>
+		/// <returns>
+		/// true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false.
+		/// </returns>
+		/// <exception cref="T:System.NullReferenceException">The <paramref name="obj"/> parameter is null.</exception>
+		public override bool Equals(object obj)
+		{
+			OracleEndpointConfiguration value = obj as OracleEndpointConfiguration;
+			if (value == null)
+				return false;
+			if (value.ConnectionString != ConnectionString || value.ScalarQueryString != ScalarQueryString)
+				return false;
+			return true;
+		}
+
+		/// <summary>
+		/// Serves as a hash function for a OracleEndpointConfiguration.
+		/// </summary>
+		/// <returns>
+		/// A hash code for the current <see cref="T:System.Object"/>.
+		/// </returns>
+		public override int GetHashCode()
+		{
+			return ConnectionString.GetHashCode() ^ ScalarQueryString.GetHashCode();
+		}
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class OracleEndpointConfigurationCollection : ConfigurationElementCollection
+	{
+		/// <summary>
+		/// When overridden in a derived class, creates a new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </summary>
+		/// <returns>
+		/// A new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new OracleEndpointConfiguration();
+		}
+
+		/// <summary>
+		/// Gets the element key for a specified configuration element when overridden in a derived class.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="T:System.Object" /> that acts as the key for the specified <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		/// <param name="element">The <see cref="T:System.Configuration.ConfigurationElement" /> to return the key for. </param>
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((OracleEndpointConfiguration)element).Name;
+		}
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class OracleEndpointConfigurationSection : ConfigurationSection
+	{
+		/// <summary>
+		/// Gets the endpoints.
+		/// </summary>
+		/// <value>The endpoints.</value>
+		[ConfigurationProperty("endpoints")]
+		public OracleEndpointConfigurationCollection Endpoints { get { return (OracleEndpointConfigurationCollection)(base["endpoints"]); } }
+	}
+}
diff --git a/Endpoint/ServiceEndpointFactory.cs b/Endpoint/ServiceEndpointFactory.cs
new file mode 100644
index 0000000..77a620f
--- /dev/null
+++ b/Endpoint/ServiceEndpointFactory.cs
@@ -0,0 +1,31 @@
+using System;
+
+namespace Endpoint
+{
+	/// <summary>
+	/// ServiceEndpointFactory
+	/// </summary>
+	public class ServiceEndpointFactory
+	{
+		/// <summary>
+		/// Creates the service endpoint based on the scheme
+		/// </summary>
+		/// <param name="config">The service endpoint configuration.</param>
+		/// <returns>The service endpoint.</returns>
+		public static IServiceEndpoint CreateServiceEndpoint(IServiceEndpointConfiguration config)
+		{
+			Type type = config.GetType();
+
+			if (type == typeof(HtmlEndpointConfiguration))
+				return new HtmlEndpoint((HtmlEndpointConfiguration)config);
+
+			if (type == typeof(HttpEndpointConfiguration))
+				return new HttpEndpoint((HttpEndpointConfiguration)config);
+
+			if (type == typeof(OracleEndpointConfiguration))
+				return new OracleEndpoint((OracleEndpointConfiguration)config);
+
+			throw new ArgumentException("Unknown type: " + type);
+		}
+	}
+}
diff --git a/Endpoint/SoapEndpoint.cs b/Endpoint/SoapEndpoint.cs
index 2ce3959..80f0e6d 100644
--- a/Endpoint/SoapEndpoint.cs
+++ b/Endpoint/SoapEndpoint.cs
@@ -4,92 +4,71 @@ using System.Xml;
 
 namespace Endpoint
 {
-	/// <summary>
-	/// A SOAP webservice endpoint.
-	/// </summary>
 	public class SoapEndpoint : HttpEndpoint
 	{
-		private string _xpathNamespaces = string.Empty;
 		private Dictionary<string, string> _namespaceToUri;
 
 		/// <summary>
-		/// Gets or sets the xpath query for the html document
+		/// Gets the SOAP endpoint configuration.
 		/// </summary>
-		/// <value>The xpath query.</value>
-		public string XpathQuery { get; set; }
+		/// <value>The SOAP endpoint configuration.</value>
+		public SoapEndpointConfiguration SoapEndpointConfiguration
+		{
+			get { return (SoapEndpointConfiguration)_httpEndpointConfiguration; }
+		}
 
 		/// <summary>
-		/// Gets or sets the namespaces used in the xpath query
+		/// Initializes a new instance of the <see cref="HttpEndpoint"/> class.
 		/// </summary>
-		/// <value>The xpath namespaces.</value>
-		public string XpathNamespaces
+		/// <param name="config">The SoapEndpointConfiguration.</param>
+		public SoapEndpoint(SoapEndpointConfiguration config)
+			: base(config)
 		{
-			get { return _xpathNamespaces; }
-			set
+			if (!string.IsNullOrEmpty(SoapEndpointConfiguration.XpathNamespaces))
 			{
-				_xpathNamespaces = value;
-				if (string.IsNullOrEmpty(_xpathNamespaces)) return;
-
-				var split = _xpathNamespaces.Split(',');
+				string[] split = SoapEndpointConfiguration.XpathNamespaces.Split(',');
 				if (split.Length != 2)
-					throw new ArgumentException("Need a comma separated pair in XpathNamespaces.");
+					throw new ArgumentException("Need a comma separated pair in XpathNamespaces.", "config");
 
 				_namespaceToUri = new Dictionary<string, string>();
 				_namespaceToUri.Add(split[0], split[1]);
 			}
 		}
 
-		/// <summary>
-		/// Gets or sets the expected query results.
-		/// </summary>
-		/// <value>The expected query results.</value>
-		public string ExpectedXpathResult { get; set; }
-
-		/// <summary>
-		/// Gets or sets the SOAP action.
-		/// </summary>
-		/// <value>The post.</value>
-		public string SoapAction { get; set; }
-
-		/// <summary>
-		/// Gets or sets the SOAP request.
-		/// </summary>
-		/// <value>The post.</value>
-		public string SoapRequest { get; set; }
-
 		/// <summary>
 		/// Gets the current status result of the endpoint
 		/// </summary>
 		/// <returns>Status</returns>
 		public override Status GetStatus()
 		{
-			var baseStatus = base.GetStatus();
-			if (baseStatus != Status.Up) // if we can't even get to the webserver, no need to try and call a WS.
+			Status baseStatus = base.GetStatus();
+			if (baseStatus != Status.Up)
 				return baseStatus;
 
 			try
 			{
-				var headers = new Dictionary<string, string> {{"SOAPAction", SoapAction}};
+				Dictionary<string, string> headers = new Dictionary<string, string>
+				                                     	{{"SOAPAction", SoapEndpointConfiguration.SoapAction}};
 
-				var xml = new XmlDocument();
+				XmlDocument xml = new XmlDocument();
 
-				xml.LoadXml(GetUrlContent(Uri, "text/xml; charset=utf-8", SoapRequest, headers));
+				xml.LoadXml(GetUrlContent(SoapEndpointConfiguration.Uri, "text/xml; charset=utf-8", SoapEndpointConfiguration.SoapRequest, headers));
 
 				XmlNodeList nodes;
 				if (_namespaceToUri != null)
 				{
-					var nsMgr = new XmlNamespaceManager(xml.NameTable);
-					foreach (var namespaceToUri in _namespaceToUri)
+					XmlNamespaceManager nsMgr = new XmlNamespaceManager(xml.NameTable);
+					foreach (KeyValuePair<string, string> namespaceToUri in _namespaceToUri)
 					{
 						nsMgr.AddNamespace(namespaceToUri.Key, namespaceToUri.Value);
 					}
 
-					nodes = xml.SelectNodes(XpathQuery, nsMgr);
+					nodes = xml.SelectNodes(SoapEndpointConfiguration.XpathQuery, nsMgr);
 				}
 				else
-					nodes = xml.SelectNodes(XpathQuery);
+					nodes = xml.SelectNodes(SoapEndpointConfiguration.XpathQuery);
 
-				//xml.Save(@"c:\soap.xml");
+				// xml.Save(@"c:\soap.xml");
 
 				// verify response has expected value
 				if (nodes == null || nodes.Count == 0)
@@ -97,11 +76,11 @@ namespace Endpoint
 					StatusDescription = "Couldn't find expected value in SOAP response";
 					return Status.Error;
 				}
-				var value = nodes[0].Value.Trim();
-				if (value != ExpectedXpathResult)
+				string value = nodes[0].Value.Trim();
+				if (value != SoapEndpointConfiguration.ExpectedXpathResult)
 				{
 					StatusDescription = String.Format("Result was: '{0}', was expecting '{1}'", value,
-					                                  ExpectedXpathResult);
+								  SoapEndpointConfiguration.ExpectedXpathResult);
 					return Status.Error;
 				}
 			}
diff --git a/Endpoint/SoapEndpointConfiguration.cs b/Endpoint/SoapEndpointConfiguration.cs
new file mode 100644
index 0000000..e0e9488
--- /dev/null
+++ b/Endpoint/SoapEndpointConfiguration.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Configuration;
+using System.Xml.Serialization;
+
+namespace Endpoint
+{
+	public class SoapEndpointConfiguration : ConfigurationElement, IHttpEndpointConfiguration
+	{
+		/// <summary>
+		/// Gets or sets the name.
+		/// </summary>
+		/// <value>The name.</value>
+		[ConfigurationProperty("name", DefaultValue = "", IsKey = true, IsRequired = true)]
+		public string Name
+		{
+			get { return (string)base["name"]; }
+			set { base["name"] = value; }
+		}
+
+		/// <summary>
+		/// URI of the service
+		/// </summary>
+		[XmlIgnore]
+		public Uri Uri
+		{
+			get { return new Uri(UriString); }
+		}
+
+		/// <summary>
+		/// Gets or sets the URI string.
+		/// </summary>
+		/// <value>The URI string.</value>
+		[ConfigurationProperty("uri", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string UriString
+		{
+			get { return (string)base["uri"]; }
+			set { base["uri"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the xpath query for the html document
+		/// </summary>
+		/// <value>The xpath query.</value>
+		[ConfigurationProperty("xpathQuery", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string XpathQuery
+		{
+			get { return (string)base["xpathQuery"]; }
+			set { base["xpathQuery"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the namespaces used in the xpath query
+		/// </summary>
+		/// <value>The xpath namespaces.</value>
+		[ConfigurationProperty("xpathNamespaces", DefaultValue = "", IsKey = false, IsRequired = false)]
+		public string XpathNamespaces
+		{
+			get { return (string)base["xpathNamespaces"]; }
+			set { base["xpathNamespaces"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the expected query results.
+		/// </summary>
+		/// <value>The expected query results.</value>
+		[ConfigurationProperty("expectedXpathResult", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string ExpectedXpathResult
+		{
+			get { return (string)base["expectedXpathResult"]; }
+			set { base["expectedXpathResult"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the SOAP action.
+		/// </summary>
+		/// <value>The post.</value>
+		[ConfigurationProperty("soapAction", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string SoapAction
+		{
+			get { return (string)base["soapAction"]; }
+			set { base["soapAction"] = value; }
+		}
+
+		/// <summary>
+		/// Gets or sets the SOAP request.
+		/// </summary>
+		/// <value>The post.</value>
+		[ConfigurationProperty("soapRequest", DefaultValue = "", IsKey = false, IsRequired = true)]
+		public string SoapRequest
+		{
+			get { return (string)base["soapRequest"]; }
+			set { base["soapRequest"] = value; }
+		}
+	}
+
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class SoapEndpointConfigurationCollection : ConfigurationElementCollection
+	{
+		/// <summary>
+		/// When overridden in a derived class, creates a new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </summary>
+		/// <returns>
+		/// A new <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		protected override ConfigurationElement CreateNewElement()
+		{
+			return new SoapEndpointConfiguration();
+		}
+
+		/// <summary>
+		/// Gets the element key for a specified configuration element when overridden in a derived class.
+		/// </summary>
+		/// <returns>
+		/// An <see cref="T:System.Object" /> that acts as the key for the specified <see cref="T:System.Configuration.ConfigurationElement" />.
+		/// </returns>
+		/// <param name="element">The <see cref="T:System.Configuration.ConfigurationElement" /> to return the key for. </param>
+		protected override object GetElementKey(ConfigurationElement element)
+		{
+			return ((SoapEndpointConfiguration)element).Name;
+		}
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	public class SoapEndpointConfigurationSection : ConfigurationSection
+	{
+		[ConfigurationProperty("endpoints")]
+		public SoapEndpointConfigurationCollection Endpoints { get { return (SoapEndpointConfigurationCollection)(base["endpoints"]); } }
+	}
+}
\ No newline at end of file
diff --git a/Endpoint/Status.cs b/Endpoint/Status.cs
index 6ebecc3..5fc26be 100644
--- a/Endpoint/Status.cs
+++ b/Endpoint/Status.cs
@@ -3,13 +3,8 @@ namespace Endpoint
 	/// <summary>
 	/// Status of an endpoint
 	/// </summary>
-	/// <remarks>The <see cref="StatusComparer"/> expects these to be in order of best-to-worst descending.</remarks>
 	public enum Status
 	{
-		/// <summary>
-		/// Service state is unknown - this will occur only before the first poll.
-		/// </summary>
-		Unknown,
 		/// <summary>
 		/// Service is working
 		/// </summary>
@@ -25,6 +20,7 @@ namespace Endpoint
 		/// <summary>
 		/// Service is available, but returns an error message
 		/// </summary>
-		Error
+		Error,
+		Unknown
 	}
 }
\ No newline at end of file
diff --git a/EndpointTest/EndpointTest.csproj b/EndpointTest/EndpointTest.csproj
index 675c9b0..b11c513 100644
--- a/EndpointTest/EndpointTest.csproj
+++ b/EndpointTest/EndpointTest.csproj
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -15,23 +14,9 @@
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -41,7 +26,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -50,14 +34,13 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="HtmlAgilityPack, Version=1.3.0.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Endpoint\References\HtmlAgilityPack.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Oracle.DataAccess, Version=2.102.2.20, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Endpoint\References\Oracle.DataAccess.dll</HintPath>
@@ -71,12 +54,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="SoapEndpointTest.cs" />
     <Compile Include="HtmlEndpointTest.cs" />
     <Compile Include="HttpEndpointTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WindowsServiceEndpointTest.cs" />
-    <Compile Include="WmiEndpointTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Endpoint\Endpoint.csproj">
@@ -84,28 +64,6 @@
       <Name>Endpoint</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/EndpointTest/HtmlEndpointTest.cs b/EndpointTest/HtmlEndpointTest.cs
index 4201f83..b3cfa91 100644
--- a/EndpointTest/HtmlEndpointTest.cs
+++ b/EndpointTest/HtmlEndpointTest.cs
@@ -1,17 +1,15 @@
 using System;
 using Endpoint;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
 namespace EndpointTest
 {
-	/// <summary>
-	///This is a test class for HtmlEndpointTest and is intended
-	///to contain all HtmlEndpointTest Unit Tests
-	///</summary>
-	[TestClass]
+    /// <summary>
+    ///This is a test class for HtmlEndpointTest and is intended
+    ///to contain all HtmlEndpointTest Unit Tests
+    ///</summary>
+	[TestClass()]
 	public class HtmlEndpointTest
 	{
-		// Random website for functional testing
 		private readonly Uri _goodUri = new Uri("http://www.seekwellness.com/sca/");
 
 		/// <summary>
@@ -20,16 +18,16 @@ namespace EndpointTest
 		[TestMethod]
 		public void HtmlEndpointConfigurationTest()
 		{
-			var target = new HtmlEndpoint
-          		{
-          			UriString = _goodUri.OriginalString,
-          			XpathQuery = "//td[contains(text(), 'Use this form')]/text()",
-          			ExpectedXpathResult = "Use this form to order your",
-          			RequestContent = "redeem_coupon=true&f_coupon_code=stuff"
-          		};
+			HtmlEndpointConfiguration config = 
+				new HtmlEndpointConfiguration {
+					UriString = _goodUri.OriginalString,
+					XpathQuery = "//td[contains(text(), 'Use this form')]/text()",
+					ExpectedXpathResult = "Use this form to order your",
+					RequestContent = "redeem_coupon=true&f_coupon_code=stuff"
+				};
+			HtmlEndpoint target = new HtmlEndpoint(config); // TODO: Initialize to an appropriate value
 
-			var status = target.GetStatus();
-			Assert.AreEqual(Status.Up, status, target.StatusDescription);
+			Status status = target.GetStatus();
 		}
 
 		/// <summary>
@@ -38,15 +36,17 @@ namespace EndpointTest
 		[TestMethod]
 		public void HtmlEndpointFormTest()
 		{
-			var target = new HtmlEndpoint
-          		{
-          			UriString = _goodUri.OriginalString,
-          			XpathQuery = "//p[@class='errorMsg']/text()",
-          			ExpectedXpathResult = "- Please enter a valid coupon code.",
-          			RequestContent = "redeem_coupon=true&f_coupon_code=stuff"
-          		};
+			HtmlEndpointConfiguration config =
+				new HtmlEndpointConfiguration
+				{
+					UriString = _goodUri.OriginalString,
+					XpathQuery = "//p[@class='errorMsg']/text()",
+					ExpectedXpathResult = "- Please enter a valid coupon code.",
+					RequestContent = "redeem_coupon=true&f_coupon_code=stuff"
+				};
+			HtmlEndpoint target = new HtmlEndpoint(config); // TODO: Initialize to an appropriate value
 
-			var status = target.GetStatus();
+			Status status = target.GetStatus();
 			Assert.AreEqual(Status.Up, status, target.StatusDescription);
 		}
 	}
diff --git a/EndpointTest/HttpEndpointTest.cs b/EndpointTest/HttpEndpointTest.cs
index bb4213e..1d7520c 100644
--- a/EndpointTest/HttpEndpointTest.cs
+++ b/EndpointTest/HttpEndpointTest.cs
@@ -1,40 +1,32 @@
-using System;
+using System.Diagnostics;
+using System.Net;
 using Endpoint;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
 
 namespace EndpointTest
 {
-	/// <summary>
-	///This is a test class for HttpEndpointTest and is intended
-	///to contain all HttpEndpointTest Unit Tests
-	///</summary>
-	[TestClass]
+    /// <summary>
+    ///This is a test class for HttpEndpointTest and is intended
+    ///to contain all HttpEndpointTest Unit Tests
+    ///</summary>
+	[TestClass()]
 	public class HttpEndpointTest
 	{
-		private readonly Uri _goodUri = new Uri("http://www.google.com");
+    	private readonly Uri _goodUri = new Uri("http://www.google.com");
 		private readonly Uri _missingUri = new Uri("http://www.google.com/gasdfasdh598yqwejbiasalsdjfhaogle");
 		private readonly Uri _unreachableDomainUri = new Uri("http://gasdfasdh598yqwejbiasalsdjfhaogle");
 		private readonly Uri _downUri = new Uri("http://192.168.0.153");
 		private readonly Uri _httpsUri = new Uri("https://sourceforge.net/");
 
 		/// <summary>
-		///A test for HttpEndpoint Constructor
+		///A test for Url
 		///</summary>
 		[TestMethod]
-		public void HttpEndpointConstructorTest()
+		public void UrlTest()
 		{
-			HttpEndpoint endpoint = new HttpEndpoint {Uri = _goodUri};
-			Assert.AreEqual(_goodUri, endpoint.Uri);
-		}
-
-		/// <summary>
-		///A test for UrlString
-		///</summary>
-		[TestMethod]
-		public void UrlStringTest()
-		{
-			HttpEndpoint endpoint = new HttpEndpoint {UriString = "http://uri/"};
-			Assert.AreEqual("http://uri/", endpoint.Uri.AbsoluteUri);
+			HttpEndpoint endpoint = new HttpEndpoint(new HttpEndpointConfiguration("", _goodUri));
+			Assert.AreEqual(_goodUri, endpoint.HttpEndpointConfiguration.Uri);
 		}
 
 		/// <summary>
@@ -43,7 +35,7 @@ namespace EndpointTest
 		[TestMethod]
 		public void GetStatusGoodTest()
 		{
-			HttpEndpoint endpoint = new HttpEndpoint {Uri = _goodUri};
+			HttpEndpoint endpoint = new HttpEndpoint(new HttpEndpointConfiguration("", _goodUri));
 			Assert.AreEqual(Status.Up, endpoint.GetStatus());
 		}
 
@@ -53,7 +45,7 @@ namespace EndpointTest
 		[TestMethod]
 		public void GetStatusMissingTest()
 		{
-			HttpEndpoint endpoint = new HttpEndpoint {Uri = _missingUri};
+			HttpEndpoint endpoint = new HttpEndpoint(new HttpEndpointConfiguration("", _missingUri));
 			Assert.AreEqual(Status.Unreachable, endpoint.GetStatus());
 		}
 
@@ -63,7 +55,7 @@ namespace EndpointTest
 		[TestMethod]
 		public void GetStatusUnreachableTest()
 		{
-			HttpEndpoint endpoint = new HttpEndpoint {Uri = _unreachableDomainUri};
+			HttpEndpoint endpoint = new HttpEndpoint(new HttpEndpointConfiguration("", _unreachableDomainUri));
 			Assert.AreEqual(Status.Unreachable, endpoint.GetStatus());
 		}
 
@@ -73,7 +65,7 @@ namespace EndpointTest
 		[TestMethod]
 		public void GetStatusDownTest()
 		{
-			HttpEndpoint endpoint = new HttpEndpoint {Uri = _downUri};
+			HttpEndpoint endpoint = new HttpEndpoint(new HttpEndpointConfiguration("", _downUri));
 			Assert.AreEqual(Status.Unreachable, endpoint.GetStatus());
 		}
 
@@ -83,8 +75,18 @@ namespace EndpointTest
 		[TestMethod]
 		public void GetHttpsTest()
 		{
-			HttpEndpoint endpoint = new HttpEndpoint {Uri = _httpsUri};
+			HttpEndpoint endpoint = new HttpEndpoint(new HttpEndpointConfiguration("", _httpsUri));
 			Assert.AreEqual(Status.Up, endpoint.GetStatus());
 		}
+
+		/// <summary>
+		///A test for HttpEndpoint Constructor
+		///</summary>
+		[TestMethod]
+		public void HttpEndpointConstructorTest()
+		{
+			HttpEndpoint endpoint = new HttpEndpoint(new HttpEndpointConfiguration("", _goodUri));
+			Assert.AreEqual(_goodUri, endpoint.HttpEndpointConfiguration.Uri);
+		}
 	}
 }
diff --git a/ServiceDashBored.sln b/ServiceDashBored.sln
index 1af2e98..8686e4a 100644
--- a/ServiceDashBored.sln
+++ b/ServiceDashBored.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.35931.194
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DA481DF1-5754-4499-AEA2-21F809256F35}"
 	ProjectSection(SolutionItems) = preProject
 		LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
@@ -14,9 +16,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EndpointTest", "EndpointTest\EndpointTest.csproj", "{76D78812-B640-4EF0-957B-15D0E9000A84}"
 EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = ServiceDashBored.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -38,4 +37,10 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {93EF7101-5AA3-4AC7-B544-93735F7253F3}
+	EndGlobalSection
+	GlobalSection(TestCaseManagementSettings) = postSolution
+		CategoryFile = ServiceDashBored.vsmdi
+	EndGlobalSection
 EndGlobal
diff --git a/ServiceDashBored/EndpointStatus.cs b/ServiceDashBored/EndpointStatus.cs
index 247ae5b..55616ab 100644
--- a/ServiceDashBored/EndpointStatus.cs
+++ b/ServiceDashBored/EndpointStatus.cs
@@ -15,34 +15,47 @@ namespace ServiceDashBored
 	{
 		#region Private Members
 
-		private readonly IEndpoint _endpoint;
-		private readonly Timer _lastUpdateTimer;
+		private readonly IServiceEndpoint _serviceEndpoint;
+		private readonly Timer _timer;
+		private Status? _status = Endpoint.Status.Unknown;
+		private string _statusMessage = string.Empty;
+		private Icon _statusIcon;
 		private DateTime _lastUpdate;
 		private readonly Logger _logger;
 		private readonly TimeSpan _updatePeriod;
-		private static readonly object _propertyUpdateSyncObject = new Object();
-		private static readonly object _callbackSyncObject = new Object();
-		private bool _insideCallback;
+		private static readonly object _syncObject = 0;
 
 		#endregion
 
-		#region Properties
+		#region  Properties
 
 		/// <summary>
-		/// Gets the icon based on the status.
+		/// Loads the icon based on the status.
 		/// </summary>
-		public Icon StatusIcon { get; private set; }
+		public Icon StatusIcon
+		{
+			get
+			{
+				return _statusIcon; 
+			}
+		}
 
 		/// <summary>
-		/// Gets service's current status.
+		/// Gets the status.
 		/// </summary>
 		/// <value>The status.</value>
-		public Status Status { get; private set; }
+		public Status Status
+		{
+			get { return _status.Value; }
+		}
 
 		/// <summary>
 		/// Returns a string explaining details on the current status
 		/// </summary>
-		public string StatusDescription { get; private set; }
+		public string StatusDescription
+		{
+			get { return _statusMessage; }
+		}
 
 		/// <summary>
 		/// Gets the time since the last update
@@ -52,41 +65,22 @@ namespace ServiceDashBored
 		{
 			get
 			{
-				if (_lastUpdate == DateTime.MinValue)
-					return "never";
-				if (_lastUpdate == DateTime.MaxValue)
-					return "updating";
-
-				var timeSpan = DateTime.Now - _lastUpdate;
+				TimeSpan timeSpan = (DateTime.Now - _lastUpdate);
 				if (timeSpan.Minutes > 0 )
 					return String.Format("{0}m {1}s", timeSpan.Minutes, timeSpan.Seconds);
 				return
-					timeSpan.Seconds + 1 + "s";
+					timeSpan.Seconds + "s";
 			}
 		}
 
 		/// <summary>
-		/// Gets the name of the service.
+		/// 
 		/// </summary>
-		/// <value>The name of the service.</value>
 		public string ServiceName
 		{
 			get
 			{
-				return _endpoint.Name;
-			}
-		}
-
-		/// <summary>
-		/// Sets the last update time.
-		/// </summary>
-		/// <value>The last update time.</value>
-		private DateTime lastUpdate
-		{
-			set
-			{
-				_lastUpdate = value;
-				SignalPropertyChanged("TimeSinceLastUpdate");
+				return _serviceEndpoint.ServiceName;
 			}
 		}
 
@@ -95,33 +89,24 @@ namespace ServiceDashBored
 		#region Public Methods
 
 		/// <summary>
-		/// Callback for the <c>threadpool</c>
+		/// Callback for the threadpool
 		/// </summary>
 		/// <param name="threadContext">The thread context.</param>
-		/// <param name="isTimeOut">The callback was triggered from a timeout</param>
-		public void ThreadPoolCallback(object threadContext, bool isTimeOut)
+		/// <param name="activated"></param>
+		public void ThreadPoolCallback(object threadContext, bool activated)
 		{
-			lock(_callbackSyncObject)
-			{
-				if (_insideCallback)
-					return;
-				_insideCallback = true;
-			}
 			try
 			{
-				// turn off the timer while waiting for an update
-				_lastUpdateTimer.Change(Timeout.Infinite, Timeout.Infinite);
+				//Debug.WriteLine(DateTime.Now + " " + _serviceEndpoint.ServiceName + ": updateStatus");
+				//_logger.LogInfo(_serviceEndpoint.ServiceName + ": updateStatus");
 				updateStatus();
+				_lastUpdate = DateTime.Now;
+				SignalPropertyChanged("TimeSinceLastUpdate");
 			}
 			catch (Exception ex)
 			{
 				// log exception
-				_logger.LogError(_endpoint.Name + ": " + ex);
-			}
-			finally
-			{
-				_lastUpdateTimer.Change(_updatePeriod, _updatePeriod);
-				_insideCallback = false;
+				_logger.LogError(_serviceEndpoint.ServiceName + ": " + ex);
 			}
 		}
 
@@ -135,21 +120,18 @@ namespace ServiceDashBored
 		/// <returns>Status</returns>
 		private void updateStatus()
 		{
-			lastUpdate = DateTime.MaxValue;
-			var newStatus = _endpoint.GetStatus();
-			if (Status != newStatus)
+			Status newStatus = _serviceEndpoint.GetStatus();
+			if (_status != newStatus)
 			{
-				Status = newStatus;
-				StatusDescription = _endpoint.StatusDescription;
-				StatusIcon = GetStatusIcon(Status);
-				// NOTE: wait to signal the property changes until all of them have been updated
+				_status = newStatus;
+				_statusMessage = _serviceEndpoint.StatusDescription;
+				_statusIcon = GetStatusIcon(_status);
 				SignalPropertyChanged("Status");
-				SignalPropertyChanged("StatusDescription");
 				SignalPropertyChanged("StatusIcon");
+				SignalPropertyChanged("StatusDescription");
 			}
-			lastUpdate = DateTime.Now;
+			_lastUpdate = DateTime.Now;
 		}
-
 		/// <summary>
 		/// Callback for the timer
 		/// </summary>
@@ -168,12 +150,10 @@ namespace ServiceDashBored
 		/// </summary>
 		/// <param name="status">The status.</param>
 		/// <returns></returns>
-		public static Icon GetStatusIcon(Status status)
+		public static Icon GetStatusIcon(Status? status)
 		{
 			switch (status)
 			{
-				case Status.Unknown:
-					return Resources.question;
 				case Status.Up:
 					return Resources.up;
 				case Status.Error:
@@ -195,16 +175,13 @@ namespace ServiceDashBored
 		/// </summary>
 		/// <param name="endpoint">The endpoint.</param>
 		/// <param name="logger">The logger.</param>
-		public EndpointStatus(IEndpoint endpoint, Logger logger)
+		public EndpointStatus(IServiceEndpoint endpoint, Logger logger)
 		{
-			_endpoint = endpoint;
-			lastUpdate = DateTime.MinValue;
+			_serviceEndpoint = endpoint;
+			_lastUpdate = DateTime.MinValue;
 			_logger = logger;
 			_updatePeriod = new TimeSpan(0, 0, 0, 1);
-			_lastUpdateTimer = new Timer(timerCallback, 0, _updatePeriod, _updatePeriod);
-			StatusIcon = GetStatusIcon(Status);
-			Status = Status.Unknown;
-			StatusDescription = string.Empty;
+			_timer = new Timer(timerCallback, 0, _updatePeriod, _updatePeriod);
 		}
 
 		#endregion
@@ -221,7 +198,7 @@ namespace ServiceDashBored
 		#region PropertyChanged methods
 
 		/// <summary>
-		/// Checks if the property (<paramref name="propertyName"/>) has been updated or changed.
+		/// Checks if the property (propertyName) has been updated or changed.
 		/// </summary>
 		/// <param name="propertyName">Name of the property.</param>
 		/// <param name="oldValue">The old value.</param>
@@ -234,7 +211,7 @@ namespace ServiceDashBored
 				return false;
 			}
 
-			if (oldValue == null || !oldValue.Equals(newValue))
+			if ((oldValue == null) || !oldValue.Equals(newValue))
 			{
 				oldValue = newValue;
 
@@ -247,7 +224,7 @@ namespace ServiceDashBored
 		}
 
 		/// <summary>
-		/// Checks if the property (<paramref name="propertyName"/>) has been updated or changed.
+		/// Checks if the property (propertyName) has been updated or changed.
 		/// </summary>
 		/// <param name="propertyName">Name of the property.</param>
 		/// <param name="oldValue">The old value.</param>
@@ -277,14 +254,11 @@ namespace ServiceDashBored
 				return;
 			try
 			{
-				lock (_propertyUpdateSyncObject) // send only one property changed event at once
+				lock (_syncObject)
 				{
 					PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
 				}
 			}
-			catch (InvalidOperationException) // HACK: Ignore the "BindingSource cannot be its own data source."
-			{
-			}
 			catch (Exception ex)
 			{
 				_logger.LogWarning("SignalPropertyChanged: " + ex);
@@ -301,7 +275,7 @@ namespace ServiceDashBored
 		///<filterpriority>2</filterpriority>
 		public void Dispose()
 		{
-			_lastUpdateTimer.Dispose();
+			_timer.Dispose();
 		}
 
 		#endregion
diff --git a/ServiceDashBored/Main.Designer.cs b/ServiceDashBored/Main.Designer.cs
index 3160e23..5c10b4c 100644
--- a/ServiceDashBored/Main.Designer.cs
+++ b/ServiceDashBored/Main.Designer.cs
@@ -37,41 +37,60 @@
 		{
 			this.components = new System.ComponentModel.Container();
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
+			this.menuStrip = new System.Windows.Forms.MenuStrip();
+			this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+			this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
-			this.trayContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
+			this.contextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
 			this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.dataGridView = new System.Windows.Forms.DataGridView();
-			this.statusIconDataGridViewImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
-			this.ServiceName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.TimeSinceLastUpdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
-			this.endpointBindingSource = new System.Windows.Forms.BindingSource(this.components);
 			this.cellTextBox = new System.Windows.Forms.TextBox();
-			this.statusTextBox = new System.Windows.Forms.RichTextBox();
-			this.splitContainer = new System.Windows.Forms.SplitContainer();
-			this.dataGridContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
-			this.updateNowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.trayContextMenuStrip.SuspendLayout();
+			this.endpointBindingSource = new System.Windows.Forms.BindingSource(this.components);
+			this.ServiceName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.statusIconDataGridViewImageColumn = new System.Windows.Forms.DataGridViewImageColumn();
+			this.StatusDescription = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.TimeSinceLastUpdate = new System.Windows.Forms.DataGridViewTextBoxColumn();
+			this.contextMenuStrip.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.endpointBindingSource)).BeginInit();
-			this.splitContainer.Panel1.SuspendLayout();
-			this.splitContainer.Panel2.SuspendLayout();
-			this.splitContainer.SuspendLayout();
-			this.dataGridContextMenuStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
+			// menuStrip
+			// 
+			this.menuStrip.Location = new System.Drawing.Point(0, 0);
+			this.menuStrip.Name = "menuStrip";
+			this.menuStrip.Size = new System.Drawing.Size(579, 24);
+			this.menuStrip.TabIndex = 0;
+			this.menuStrip.Text = "menuStrip1";
+			// 
+			// helpToolStripMenuItem
+			// 
+			this.helpToolStripMenuItem.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
+			this.helpToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.aboutToolStripMenuItem});
+			this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
+			this.helpToolStripMenuItem.Size = new System.Drawing.Size(40, 20);
+			this.helpToolStripMenuItem.Text = "Help";
+			// 
+			// aboutToolStripMenuItem
+			// 
+			this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem";
+			this.aboutToolStripMenuItem.Size = new System.Drawing.Size(114, 22);
+			this.aboutToolStripMenuItem.Text = "About";
+			// 
 			// notifyIcon
 			// 
-			this.notifyIcon.ContextMenuStrip = this.trayContextMenuStrip;
+			this.notifyIcon.ContextMenuStrip = this.contextMenuStrip;
 			this.notifyIcon.Text = "Service DashBored";
 			this.notifyIcon.Visible = true;
 			this.notifyIcon.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.notifyIcon_MouseDoubleClick);
 			// 
-			// trayContextMenuStrip
+			// contextMenuStrip
 			// 
-			this.trayContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+			this.contextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.exitToolStripMenuItem});
-			this.trayContextMenuStrip.Name = "trayContextMenuStrip";
-			this.trayContextMenuStrip.Size = new System.Drawing.Size(104, 26);
+			this.contextMenuStrip.Name = "contextMenuStrip";
+			this.contextMenuStrip.Size = new System.Drawing.Size(104, 26);
 			// 
 			// exitToolStripMenuItem
 			// 
@@ -90,33 +109,52 @@
 						| System.Windows.Forms.AnchorStyles.Left)
 						| System.Windows.Forms.AnchorStyles.Right)));
 			this.dataGridView.AutoGenerateColumns = false;
-			this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
-			this.dataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.DisplayedCells;
 			this.dataGridView.BorderStyle = System.Windows.Forms.BorderStyle.None;
 			this.dataGridView.CellBorderStyle = System.Windows.Forms.DataGridViewCellBorderStyle.None;
 			this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText;
-			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
 			this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.statusIconDataGridViewImageColumn,
             this.ServiceName,
+            this.statusIconDataGridViewImageColumn,
+            this.StatusDescription,
             this.TimeSinceLastUpdate});
 			this.dataGridView.DataSource = this.endpointBindingSource;
 			this.dataGridView.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
 			this.dataGridView.EnableHeadersVisualStyles = false;
-			this.dataGridView.Location = new System.Drawing.Point(12, 12);
-			this.dataGridView.MultiSelect = false;
+			this.dataGridView.Location = new System.Drawing.Point(12, 27);
 			this.dataGridView.Name = "dataGridView";
 			this.dataGridView.ReadOnly = true;
 			this.dataGridView.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
 			this.dataGridView.RowHeadersVisible = false;
 			this.dataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-			this.dataGridView.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-			this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
-			this.dataGridView.Size = new System.Drawing.Size(368, 126);
+			this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
+			this.dataGridView.Size = new System.Drawing.Size(555, 156);
 			this.dataGridView.TabIndex = 1;
-			this.dataGridView.RowEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_RowEnter);
-			this.dataGridView.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dataGridView_MouseUp);
-			this.dataGridView.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dataGridView_DataError);
+			this.dataGridView.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView_CellEnter);
+			// 
+			// cellTextBox
+			// 
+			this.cellTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+						| System.Windows.Forms.AnchorStyles.Right)));
+			this.cellTextBox.Location = new System.Drawing.Point(12, 189);
+			this.cellTextBox.Name = "cellTextBox";
+			this.cellTextBox.ReadOnly = true;
+			this.cellTextBox.Size = new System.Drawing.Size(555, 20);
+			this.cellTextBox.TabIndex = 2;
+			// 
+			// endpointBindingSource
+			// 
+			this.endpointBindingSource.DataSource = typeof(ServiceDashBored.EndpointStatus);
+			// 
+			// ServiceName
+			// 
+			this.ServiceName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.ColumnHeader;
+			this.ServiceName.DataPropertyName = "ServiceName";
+			this.ServiceName.HeaderText = "Service";
+			this.ServiceName.MinimumWidth = 100;
+			this.ServiceName.Name = "ServiceName";
+			this.ServiceName.ReadOnly = true;
+			this.ServiceName.Resizable = System.Windows.Forms.DataGridViewTriState.False;
 			// 
 			// statusIconDataGridViewImageColumn
 			// 
@@ -129,14 +167,13 @@
 			this.statusIconDataGridViewImageColumn.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
 			this.statusIconDataGridViewImageColumn.Width = 30;
 			// 
-			// ServiceName
+			// StatusDescription
 			// 
-			this.ServiceName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-			this.ServiceName.DataPropertyName = "ServiceName";
-			this.ServiceName.HeaderText = "Service";
-			this.ServiceName.MinimumWidth = 100;
-			this.ServiceName.Name = "ServiceName";
-			this.ServiceName.ReadOnly = true;
+			this.StatusDescription.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+			this.StatusDescription.DataPropertyName = "StatusDescription";
+			this.StatusDescription.HeaderText = "Status";
+			this.StatusDescription.Name = "StatusDescription";
+			this.StatusDescription.ReadOnly = true;
 			// 
 			// TimeSinceLastUpdate
 			// 
@@ -145,112 +182,46 @@
 			this.TimeSinceLastUpdate.HeaderText = "Last Update";
 			this.TimeSinceLastUpdate.Name = "TimeSinceLastUpdate";
 			this.TimeSinceLastUpdate.ReadOnly = true;
-			this.TimeSinceLastUpdate.Resizable = System.Windows.Forms.DataGridViewTriState.False;
 			this.TimeSinceLastUpdate.Width = 90;
 			// 
-			// endpointBindingSource
-			// 
-			this.endpointBindingSource.DataSource = typeof(ServiceDashBored.EndpointStatus);
-			// 
-			// cellTextBox
-			// 
-			this.cellTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.cellTextBox.Location = new System.Drawing.Point(12, 144);
-			this.cellTextBox.Name = "cellTextBox";
-			this.cellTextBox.ReadOnly = true;
-			this.cellTextBox.Size = new System.Drawing.Size(368, 20);
-			this.cellTextBox.TabIndex = 2;
-			// 
-			// statusTextBox
-			// 
-			this.statusTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-						| System.Windows.Forms.AnchorStyles.Left)
-						| System.Windows.Forms.AnchorStyles.Right)));
-			this.statusTextBox.BackColor = System.Drawing.SystemColors.Window;
-			this.statusTextBox.Location = new System.Drawing.Point(12, 3);
-			this.statusTextBox.Name = "statusTextBox";
-			this.statusTextBox.ReadOnly = true;
-			this.statusTextBox.Size = new System.Drawing.Size(368, 85);
-			this.statusTextBox.TabIndex = 3;
-			this.statusTextBox.Text = "";
-			// 
-			// splitContainer
-			// 
-			this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.splitContainer.Location = new System.Drawing.Point(0, 0);
-			this.splitContainer.Name = "splitContainer";
-			this.splitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
-			// 
-			// splitContainer.Panel1
-			// 
-			this.splitContainer.Panel1.Controls.Add(this.cellTextBox);
-			this.splitContainer.Panel1.Controls.Add(this.dataGridView);
-			this.splitContainer.Panel1MinSize = 135;
-			// 
-			// splitContainer.Panel2
-			// 
-			this.splitContainer.Panel2.Controls.Add(this.statusTextBox);
-			this.splitContainer.Panel2MinSize = 100;
-			this.splitContainer.Size = new System.Drawing.Size(392, 270);
-			this.splitContainer.SplitterDistance = 166;
-			this.splitContainer.SplitterWidth = 3;
-			this.splitContainer.TabIndex = 4;
-			// 
-			// dataGridContextMenuStrip
-			// 
-			this.dataGridContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.updateNowToolStripMenuItem});
-			this.dataGridContextMenuStrip.Name = "dataGridContextMenuStrip";
-			this.dataGridContextMenuStrip.Size = new System.Drawing.Size(145, 26);
-			// 
-			// updateNowToolStripMenuItem
-			// 
-			this.updateNowToolStripMenuItem.Name = "updateNowToolStripMenuItem";
-			this.updateNowToolStripMenuItem.Size = new System.Drawing.Size(144, 22);
-			this.updateNowToolStripMenuItem.Text = "Update Now";
-			this.updateNowToolStripMenuItem.Click += new System.EventHandler(this.updateNowToolStripMenuItem_Click);
-			// 
 			// Main
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(392, 270);
-			this.Controls.Add(this.splitContainer);
+			this.ClientSize = new System.Drawing.Size(579, 218);
+			this.Controls.Add(this.cellTextBox);
+			this.Controls.Add(this.dataGridView);
+			this.Controls.Add(this.menuStrip);
 			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.MainMenuStrip = this.menuStrip;
 			this.MaximizeBox = false;
-			this.MinimumSize = new System.Drawing.Size(400, 300);
+			this.MinimumSize = new System.Drawing.Size(587, 248);
 			this.Name = "Main";
 			this.Text = "Service DashBored";
-			this.Load += new System.EventHandler(this.main_Load);
-			this.Resize += new System.EventHandler(this.main_Resize);
-			this.trayContextMenuStrip.ResumeLayout(false);
+			this.Load += new System.EventHandler(this.Main_Load);
+			this.contextMenuStrip.ResumeLayout(false);
 			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.endpointBindingSource)).EndInit();
-			this.splitContainer.Panel1.ResumeLayout(false);
-			this.splitContainer.Panel1.PerformLayout();
-			this.splitContainer.Panel2.ResumeLayout(false);
-			this.splitContainer.ResumeLayout(false);
-			this.dataGridContextMenuStrip.ResumeLayout(false);
 			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
 		#endregion
 
+		private System.Windows.Forms.MenuStrip menuStrip;
+		private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
+		private System.Windows.Forms.ToolStripMenuItem aboutToolStripMenuItem;
 		private System.Windows.Forms.NotifyIcon notifyIcon;
-		private System.Windows.Forms.ContextMenuStrip trayContextMenuStrip;
+		private System.Windows.Forms.ContextMenuStrip contextMenuStrip;
 		private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem;
 		private System.Windows.Forms.DataGridView dataGridView;
 		private System.Windows.Forms.BindingSource endpointBindingSource;
 		private System.Windows.Forms.TextBox cellTextBox;
-		private System.Windows.Forms.DataGridViewImageColumn statusIconDataGridViewImageColumn;
-		private System.Windows.Forms.DataGridViewTextBoxColumn TimeSinceLastUpdate;
-		private System.Windows.Forms.RichTextBox statusTextBox;
-		private System.Windows.Forms.SplitContainer splitContainer;
 		private System.Windows.Forms.DataGridViewTextBoxColumn ServiceName;
-		private System.Windows.Forms.ContextMenuStrip dataGridContextMenuStrip;
-		private System.Windows.Forms.ToolStripMenuItem updateNowToolStripMenuItem;
+		private System.Windows.Forms.DataGridViewImageColumn statusIconDataGridViewImageColumn;
+		private System.Windows.Forms.DataGridViewTextBoxColumn StatusDescription;
+		private System.Windows.Forms.DataGridViewTextBoxColumn TimeSinceLastUpdate;
 	}
 }
 
diff --git a/ServiceDashBored/Main.cs b/ServiceDashBored/Main.cs
index eab70b6..091aacf 100644
--- a/ServiceDashBored/Main.cs
+++ b/ServiceDashBored/Main.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Drawing;
+using System.Configuration;
 using System.Threading;
 using System.Windows.Forms;
 using BitFactory.Logging;
@@ -9,100 +9,190 @@ using Endpoint;
 
 namespace ServiceDashBored
 {
-	/// <summary>
-	/// DashBored's UI.
-	/// </summary>
 	public partial class Main : Form
 	{
-		/// <summary>
-		/// Number of seconds between trying to poll an endpoint for its status
-		/// </summary>
-		private const int ENDPOINT_POLL_TIME_INTERVAL = 30;
-
-		/// <summary>
-		/// Number of milliseconds to display status updates on the system tray notify balloon
-		/// </summary>
-		private const int NOTIFY_BALLOON_UPDATE_DELAY = 300;
-
-		/// <summary>
-		/// Win32 message for when the user ends their session.
-		/// </summary>
-		/// <remarks>http://msdn.microsoft.com/en-us/library/aa376890(VS.85).aspx</remarks>
-		private const int WM_QUERYENDSESSION = 0x11;
-
-		/// <summary>
-		/// The status to display in the system tray
-		/// </summary>
-		private Status _systemTrayStatusIcon = Status.Timeout;
-		private readonly BindingList<EndpointStatus> _endpoints;
-		private readonly Dictionary<EndpointStatus, Status> _endpointStatuses;
-		private readonly Dictionary<EndpointStatus, EventWaitHandle> _endpointEventWaitHandle;
-
-		/// <summary>
-		/// Default font for the Status Description text box
-		/// </summary>
-		private readonly Font _defaultFont = new Font("Microsoft Sans Serif", (float)8.25, FontStyle.Regular);
-		/// <summary>
-		/// Bold font for the Status Description text box
-		/// </summary>
-		private readonly Font _boldFont = new Font("Microsoft Sans Serif", (float)8.25, FontStyle.Bold);
-		/// <summary>
-		/// Different colors to use for each Status
-		/// </summary>
-		private readonly Dictionary<Status, Color> _statusColor
-			= new Dictionary<Status, Color>
-			  	{
-			  		{Status.Error, Color.DarkRed},
-			  		{Status.Timeout, Color.DarkOrange},
-			  		{Status.Unknown, Color.DarkOrange},
-			  		{Status.Unreachable, Color.DarkRed},
-			  		{Status.Up, Color.DarkGreen},
-			  	};
-
-		/// <summary>
-		/// Set to true when windows is closing the current session.
-		/// </summary>
-		private bool _endSessionPending;
-
-		/// <summary>
-		/// Logger instance.
-		/// </summary>
-		private readonly Logger _logger;
+		private Status _mainStatusIcon = Status.Timeout;
+		private BindingList<EndpointStatus> _endpointStatus;
+		private Dictionary<EndpointStatus, RegisteredWaitHandle> _endpointWaitHandle;
+		private Logger _logger;
+		private const string LOG_FILENAME = "ServiceDashBored.log";
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="Main"/> class.
 		/// </summary>
-		public Main(IEnumerable<IEndpoint> endpoints, Logger logger)
+		public Main()
 		{
 			InitializeComponent();
 
-			_logger = logger;
+			Resize += Main_Resize;
+		}
 
-			_logger.LogInfo("Starting.");
+		/// <summary>
+		/// Handles the Resize event of the Main control.
+		/// </summary>
+		/// <param name="sender">The source of the event.</param>
+		/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+		void Main_Resize(object sender, EventArgs e)
+		{
+			ShowInTaskbar = !(WindowState == FormWindowState.Minimized);
+		}
 
-			loadMainIcon(Status.Up);
+		/// <summary>
+		/// Loads the icon based on the status.
+		/// </summary>
+		/// <param name="status">The status.</param>
+		private void LoadMainIcon(Status status)
+		{
+			if (_mainStatusIcon == status) 
+				return;
 
-			_endpoints = new BindingList<EndpointStatus>();
-			endpointBindingSource.DataSource = _endpoints;
-			_endpointStatuses = new Dictionary<EndpointStatus, Status>();
-			_endpointEventWaitHandle = new Dictionary<EndpointStatus, EventWaitHandle>();
+			notifyIcon.Icon = EndpointStatus.GetStatusIcon(status);
+			
+			notifyIcon.BalloonTipIcon = (status == Status.Up) ? ToolTipIcon.Info : ToolTipIcon.Error;
 
-			foreach (var serviceEndpoint in endpoints)
+			_mainStatusIcon = status;
+		}
+
+		/// <summary>
+		/// Handles the Load event of the Main control.
+		/// </summary>
+		/// <param name="sender">The source of the event.</param>
+		/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+		private void Main_Load(object sender, EventArgs e)
+		{
+			_logger = new FileLogger(LOG_FILENAME);
+
+			LoadMainIcon(Status.Up);
+
+			notifyIcon.BalloonTipTitle = "Service DashBored";
+			notifyIcon.BalloonTipClicked += notifyIcon_BalloonTipClicked;
+
+			_endpointStatus = new BindingList<EndpointStatus>();
+			endpointBindingSource.DataSource = _endpointStatus;
+			_endpointWaitHandle = new Dictionary<EndpointStatus, RegisteredWaitHandle>();
+
+			HttpEndpointConfigurationSection httpEndpointConfigurationSection
+				= (HttpEndpointConfigurationSection) ConfigurationManager.GetSection("httpEndpointSection");
+			foreach (HttpEndpointConfiguration endpointConfig in httpEndpointConfigurationSection.Endpoints)
+				registerServiceEndpoint(new HttpEndpoint(endpointConfig));
+
+			HtmlEndpointConfigurationSection htmlEndpointConfigurationSection 
+				= (HtmlEndpointConfigurationSection)ConfigurationManager.GetSection("htmlEndpointSection");
+			foreach (HtmlEndpointConfiguration endpointConfig in htmlEndpointConfigurationSection.Endpoints)
+				registerServiceEndpoint(new HtmlEndpoint(endpointConfig));
+
+			OracleEndpointConfigurationSection oracleEndpointConfigurationSection
+				= (OracleEndpointConfigurationSection)ConfigurationManager.GetSection("oracleEndpointSection");
+			foreach (OracleEndpointConfiguration endpointConfig in oracleEndpointConfigurationSection.Endpoints)
+				registerServiceEndpoint(new OracleEndpoint(endpointConfig));
+
+			SoapEndpointConfigurationSection soapEndpointConfigurationSection
+				= (SoapEndpointConfigurationSection)ConfigurationManager.GetSection("soapEndpointSection");
+			foreach (SoapEndpointConfiguration endpointConfig in soapEndpointConfigurationSection.Endpoints)
+				registerServiceEndpoint(new SoapEndpoint(endpointConfig));
+		}
+
+		/// <summary>
+		/// Registers the service endpoint.
+		/// </summary>
+		/// <param name="serviceEndpoint">The service endpoint.</param>
+		private void registerServiceEndpoint(IServiceEndpoint serviceEndpoint)
+		{
+			EndpointStatus endpointStatus = new EndpointStatus(serviceEndpoint, _logger);
+			_endpointStatus.Add(endpointStatus);
+			endpointStatus.PropertyChanged += Endpoint_PropertyChanged;
+			
+			// Time Interval MasterThread will be executed
+			TimeSpan timeOut = TimeSpan.FromSeconds(30);
+			
+			// Start timer thread
+			AutoResetEvent autoResetEvent = new AutoResetEvent(false);
+			RegisteredWaitHandle handle = ThreadPool.RegisterWaitForSingleObject(
+				autoResetEvent,
+				endpointStatus.ThreadPoolCallback,
+				"SomeState",
+				timeOut,
+				false
+				);
+
+			_endpointWaitHandle.Add(endpointStatus, handle);
+			autoResetEvent.Set();
+		}
+
+		/// <summary>
+		/// Handles the PropertyChanged event of an Endpoint.
+		/// </summary>
+		/// <param name="sender">The source of the event.</param>
+		/// <param name="e">The <see cref="System.ComponentModel.PropertyChangedEventArgs"/> instance containing the event data.</param>
+		void Endpoint_PropertyChanged(object sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName != "Status") return;
+
+			EndpointStatus senderEndpointStatus = sender as EndpointStatus;
+			if (senderEndpointStatus == null)
+				throw new ArgumentException("sender is not EndpointStatus - it is: " + sender.GetType());
+
+			List<EndpointStatus> downEndpoints = new List<EndpointStatus>();
+			List<EndpointStatus> unreachableEndpoints = new List<EndpointStatus>();
+
+			if (senderEndpointStatus.Status != Status.Up)
 			{
-				registerServiceEndpoint(serviceEndpoint);
+				foreach (EndpointStatus endpointStatus in _endpointStatus)
+				{
+					switch (endpointStatus.Status)
+					{
+						case Status.Timeout:
+							downEndpoints.Add(endpointStatus);
+							break;
+						case Status.Unreachable:
+							unreachableEndpoints.Add(endpointStatus);
+							break;
+						case Status.Error:
+							downEndpoints.Add(endpointStatus);
+							break;
+					}
+				}
+			}
+
+			string msg = string.Empty;
+			if (downEndpoints.Count > 0)
+			{
+				LoadMainIcon(Status.Timeout);
+				msg += "These services are timing out:" + Environment.NewLine + getEndpointString(downEndpoints);
+			}
+			if (unreachableEndpoints.Count > 0)
+			{
+				LoadMainIcon(Status.Unreachable);
+				msg += "These services are unreachable:" + Environment.NewLine + getEndpointString(unreachableEndpoints);
+			}
+
+			if (msg.Length > 0)
+			{
+				notifyIcon.BalloonTipText = msg;
+				notifyIcon.Text = "Service Problem";
+				notifyIcon.ShowBalloonTip(1500);
+			}
+			else if (downEndpoints.Count == 0 && unreachableEndpoints.Count == 0)
+			{
+				LoadMainIcon(Status.Up);
+				notifyIcon.Text = "All services are running.";
+				notifyIcon.BalloonTipText = notifyIcon.Text;
 			}
 		}
 
 		/// <summary>
-		/// Override to intercept WM_QUERYENDSESSION - so we know when the current OS session is ending.
+		/// Concatenates each endpoint description into a single string
 		/// </summary>
-		/// <param name="m"></param>
-		/// <remarks>http://www.pixvillage.com/blogs/devblog/archive/2005/03/26/174.aspx</remarks>
-		protected override void WndProc(ref Message m)
+		/// <param name="endpointStatuses">The endpoint statuses.</param>
+		/// <returns></returns>
+		private static string getEndpointString(List<EndpointStatus> endpointStatuses)
 		{
-			if (m.Msg == WM_QUERYENDSESSION)
-				_endSessionPending = true;
-			base.WndProc(ref m);
+			string result = string.Empty;
+			endpointStatuses.ForEach(delegate(EndpointStatus endpointStatus)
+             	{
+             		result += endpointStatus.ServiceName + Environment.NewLine;
+             	});
+			return result;
 		}
 
 		/// <summary>
@@ -111,51 +201,14 @@ namespace ServiceDashBored
 		/// <param name="e"></param>
 		protected override void OnClosing(CancelEventArgs e)
 		{
-			if (!_endSessionPending)
+			if (!Environment.HasShutdownStarted)
 			{
 				e.Cancel = true;
-				WindowState = FormWindowState.Minimized; // minimize instead of close
+				WindowState = FormWindowState.Minimized;
 			}
 			base.OnClosing(e);
 		}
 
-		/// <summary>
-		/// Handles the Resize event of the Main control.
-		/// </summary>
-		/// <param name="sender">The source of the event.</param>
-		/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-		void main_Resize(object sender, EventArgs e)
-		{
-			ShowInTaskbar = WindowState != FormWindowState.Minimized;
-		}
-
-		/// <summary>
-		/// Handles the Load event of the Main control.
-		/// </summary>
-		/// <param name="sender">The source of the event.</param>
-		/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-		private void main_Load(object sender, EventArgs e)
-		{
-			notifyIcon.BalloonTipTitle = "Service DashBored";
-			notifyIcon.BalloonTipClicked += notifyIcon_BalloonTipClicked;
-		}
-
-		/// <summary>
-		/// Handles the PropertyChanged event of an Endpoint.
-		/// </summary>
-		/// <param name="sender">The source of the event.</param>
-		/// <param name="e">The <see cref="System.ComponentModel.PropertyChangedEventArgs"/> instance containing the event data.</param>
-		void endpoint_PropertyChanged(object sender, PropertyChangedEventArgs e)
-		{
-			if (e.PropertyName != "Status") return;
-
-			var senderEndpointStatus = sender as EndpointStatus;
-			if (senderEndpointStatus == null)
-				throw new ArgumentException("sender is not EndpointStatus - it is: " + sender.GetType());
-
-			Invoke((MethodInvoker)(()=>updateStatus(senderEndpointStatus)));
-		}
-
 		/// <summary>
 		/// Handles the BalloonTipClicked event of the notifyIcon control.
 		/// </summary>
@@ -176,7 +229,6 @@ namespace ServiceDashBored
 		/// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
 		private void exitToolStripMenuItem_Click(object sender, EventArgs e)
 		{
-			_logger.LogInfo("User Exiting.");
 			Application.Exit();
 		}
 
@@ -200,228 +252,16 @@ namespace ServiceDashBored
 			}
 		}
 
-		private void dataGridView_RowEnter(object sender, DataGridViewCellEventArgs e)
+		private void dataGridView_CellEnter(object sender, DataGridViewCellEventArgs e)
 		{
-			var endpointStatus = (EndpointStatus)dataGridView.Rows[e.RowIndex].DataBoundItem;
-			cellTextBox.Text = string.Format("{0}.  Status Description: {1}", 
-				endpointStatus.ServiceName, endpointStatus.StatusDescription);
-		}
-
-		private void dataGridView_DataError(object sender, DataGridViewDataErrorEventArgs e)
-		{
-			_logger.LogError(e.Exception);
-		}
-
-		/// <summary>
-		/// Registers the service endpoint.
-		/// </summary>
-		/// <param name="endpoint">The service endpoint.</param>
-		private void registerServiceEndpoint(IEndpoint endpoint)
-		{
-			var endpointStatus = new EndpointStatus(endpoint, _logger);
-			
-			// Time Interval MasterThread will be executed
-			var timeOut = TimeSpan.FromSeconds(ENDPOINT_POLL_TIME_INTERVAL);
-			
-			// Register a timed callback method in the threadpool.
-			var waitObject = new AutoResetEvent(false);
-			ThreadPool.RegisterWaitForSingleObject(
-				waitObject,
-				endpointStatus.ThreadPoolCallback,
-				null,
-				timeOut,
-				false
-				);
-
-			_endpoints.Add(endpointStatus);
-			_endpointStatuses.Add(endpointStatus, endpointStatus.Status);
-			_endpointEventWaitHandle.Add(endpointStatus, waitObject);
-			endpointStatus.PropertyChanged += endpoint_PropertyChanged;
-
-			waitObject.Set(); // signal an initial callback when done registying
-		}
-
-		/// <summary>
-		/// Loads the icon based on the status.
-		/// </summary>
-		/// <param name="status">The status.</param>
-		private void loadMainIcon(Status status)
-		{
-			if (_systemTrayStatusIcon == status) 
-				return;
-
-			notifyIcon.Icon = EndpointStatus.GetStatusIcon(status);
-			
-			notifyIcon.BalloonTipIcon = (status == Status.Up) ? ToolTipIcon.Info : ToolTipIcon.Error;
-
-			_systemTrayStatusIcon = status;
-		}
-
-		/// <summary>
-		/// Updates the status for the given endpoint.
-		/// </summary>
-		/// <remarks>Execute on UI thread</remarks>
-		/// <param name="endpointStatus">The endpoint status.</param>
-		private void updateStatus(EndpointStatus endpointStatus)
-		{
-			if (endpointStatus == null)
-				throw new ArgumentNullException("endpointStatus");
-
-			lock (_endpoints)
+			DataGridViewColumn column = dataGridView.Columns[e.ColumnIndex];
+			if (column.ValueType == typeof(string))
 			{
-				// if the status hasn't changed, don't do anything...
-				if (_endpointStatuses[endpointStatus] == endpointStatus.Status) return;
-
-				// if the status has changed...
-				var oldStatus = _endpointStatuses[endpointStatus];
-				_endpointStatuses[endpointStatus] = endpointStatus.Status;
-
-				// find the worst status of all
-				var statuses = new List<Status>(_endpointStatuses.Values);
-				statuses.Sort(new StatusComparer());
-				loadMainIcon(statuses[0]);
-
-				// update the system tray notify ballon info
-				notifyIcon.BalloonTipText = getShortServiceStatusMessage(endpointStatus);
-				notifyIcon.Text = endpointStatus.Status == Status.Up ? "Service Running" : "Service Problem";
-
-				// update the info in the status text box
-				updateStatusTextBox();
-
-				if (oldStatus != Status.Unknown || endpointStatus.Status != Status.Up)
-				{
-					notifyIcon.ShowBalloonTip(NOTIFY_BALLOON_UPDATE_DELAY);
-					_logger.LogInfo(string.Format("{0}. {1} : {2}", endpointStatus.ServiceName, endpointStatus.Status,
-					                              endpointStatus.StatusDescription));
-				}
+				cellTextBox.Text = (string)dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value;
 			}
-		}
-
-		/// <summary>
-		/// Updates the status text box - call this from the UI thread.
-		/// </summary>
-		private void updateStatusTextBox()
-		{
-			statusTextBox.Text = String.Empty;
-			var first = true;
-			foreach (var endpointStatus in _endpoints)
+			else
 			{
-				if (endpointStatus.Status == Status.Up || endpointStatus.Status == Status.Unknown)
-					continue;
-
-				if (!first)
-				{
-					statusTextBox.SelectedText = Environment.NewLine + Environment.NewLine;
-				}
-				else
-				{
-					first = false;
-				}
-
-				// Make the service description all pretty in the rich text box
-				statusTextBox.SelectionColor = _statusColor[endpointStatus.Status];
-				statusTextBox.SelectionFont = _defaultFont; 
-				statusTextBox.SelectedText = endpointStatus.ServiceName;
-
-				statusTextBox.SelectionColor = Color.Black;
-				statusTextBox.SelectionFont = _defaultFont;
-				statusTextBox.SelectedText = ". ";
-
-				statusTextBox.SelectionColor = _statusColor[endpointStatus.Status];
-				statusTextBox.SelectionFont = _boldFont; 
-				statusTextBox.SelectedText = endpointStatus.Status.ToString();
-	
-				statusTextBox.SelectionColor = Color.Black;
-				statusTextBox.SelectionFont = _defaultFont;
-				statusTextBox.SelectedText = " : " + endpointStatus.StatusDescription;
-			}
-		}
-
-		/// <summary>
-		/// Gets the service status message.
-		/// </summary>
-		/// <param name="senderEndpointStatus">The sender endpoint status.</param>
-		/// <returns></returns>
-		private static string getShortServiceStatusMessage(EndpointStatus senderEndpointStatus)
-		{
-			var msg = string.Empty;
-			switch (senderEndpointStatus.Status)
-			{
-				case Status.Error:
-					msg = "Service Error: " + senderEndpointStatus.ServiceName;
-					break;
-				case Status.Timeout:
-					msg = "Service Timeout: " + senderEndpointStatus.ServiceName;
-					break;
-				case Status.Unknown:
-					msg = "Status Unknown: " + senderEndpointStatus.ServiceName;
-					break;
-				case Status.Unreachable:
-					msg = "Service Unreachable: " + senderEndpointStatus.ServiceName;
-					break;
-				case Status.Up:
-					msg = "Service Running: " + senderEndpointStatus.ServiceName;
-					break;
-			}
-			return msg;
-		}
-
-		private void dataGridView_MouseUp(object sender, MouseEventArgs e)
-		{
-			var hitTestInfo = dataGridView.HitTest(e.X, e.Y);
-			if (hitTestInfo.Type != DataGridViewHitTestType.Cell)
-			{
-				// deselect everything
-				var selectedEndpointStatus = getSelectedDataGridViewRow();
-				if (selectedEndpointStatus != null)
-					selectedEndpointStatus.Selected = false;
-				return;
-			}
-
-			if (e.Button == MouseButtons.Right && hitTestInfo.RowIndex >= 0)
-			{
-				// select row on right click as well
-				if (hitTestInfo.RowIndex >= 0)
-				{
-					var selectedEndpointStatus = getSelectedDataGridViewRow();
-					if (selectedEndpointStatus != null)
-						selectedEndpointStatus.Selected = false;
-
-					var clickedRow = dataGridView.Rows[hitTestInfo.RowIndex];
-					clickedRow.Selected = true;
-				}
-
-				// show the context menu
-				dataGridContextMenuStrip.Show(dataGridView, e.Location);
-			}
-		}
-
-		private DataGridViewRow getSelectedDataGridViewRow()
-		{
-			return dataGridView.SelectedRows.Count > 0
-				? dataGridView.Rows[dataGridView.SelectedRows[0].Index] 
-				: null;
-		}
-
-		private EndpointStatus getSelectedEndpointStatus()
-		{
-			var dataGridViewRow = getSelectedDataGridViewRow();
-			return dataGridViewRow != null 
-				? dataGridViewRow.DataBoundItem as EndpointStatus 
-				: null;
-		}
-
-		private void updateNowToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				var endpointStatus = getSelectedEndpointStatus();
-				if (endpointStatus != null)
-					_endpointEventWaitHandle[endpointStatus].Set();
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex);
+				cellTextBox.Text = string.Empty;
 			}
 		}
 	}
diff --git a/ServiceDashBored/Main.resx b/ServiceDashBored/Main.resx
index e54c8b6..68a6798 100644
--- a/ServiceDashBored/Main.resx
+++ b/ServiceDashBored/Main.resx
@@ -117,20 +117,26 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>160, 17</value>
-  </metadata>
-  <metadata name="trayContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="notifyIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>126, 10</value>
+  </metadata>
+  <metadata name="contextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>227, 10</value>
+  </metadata>
+  <metadata name="ServiceName.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="StatusDescription.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="TimeSinceLastUpdate.UserAddedColumn" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="endpointBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>245, 17</value>
-  </metadata>
-  <metadata name="dataGridContextMenuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>395, 17</value>
+    <value>349, 10</value>
   </metadata>
   <metadata name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
diff --git a/ServiceDashBored/Program.cs b/ServiceDashBored/Program.cs
index e0da7bb..93097ca 100644
--- a/ServiceDashBored/Program.cs
+++ b/ServiceDashBored/Program.cs
@@ -1,9 +1,5 @@
 using System;
 using System.Windows.Forms;
-using BitFactory.Logging;
-using Castle.Core.Resource;
-using Castle.Windsor;
-using Castle.Windsor.Configuration.Interpreters;
 
 namespace ServiceDashBored
 {
@@ -15,28 +11,9 @@ namespace ServiceDashBored
 		[STAThread]
 		static void Main()
 		{
-			IWindsorContainer container =
-				new WindsorContainer(
-					new XmlInterpreter(new ConfigResource("castle")));
-
-			// Request the component to use it
-			var form = (Main)container[typeof(Main)];
-
-			try
-			{
-				// Use the component
-				Application.Run(form);
-			}
-			catch (Exception ex)
-			{
-				var logger = (Logger)container[typeof(Logger)];
-				logger.LogFatal(ex);
-			}
-			finally
-			{
-				// Release it
-				container.Release(form);
-			}
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
+			Application.Run(new Main());
 		}
 	}
 }
diff --git a/ServiceDashBored/Properties/Resources.Designer.cs b/ServiceDashBored/Properties/Resources.Designer.cs
index fbd6897..f786486 100644
--- a/ServiceDashBored/Properties/Resources.Designer.cs
+++ b/ServiceDashBored/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30128.1
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -19,7 +19,7 @@ namespace ServiceDashBored.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -60,6 +60,9 @@ namespace ServiceDashBored.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
         internal static System.Drawing.Icon accept {
             get {
                 object obj = ResourceManager.GetObject("accept", resourceCulture);
@@ -67,13 +70,19 @@ namespace ServiceDashBored.Properties {
             }
         }
         
-        internal static System.Drawing.Icon question {
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon help {
             get {
-                object obj = ResourceManager.GetObject("question", resourceCulture);
+                object obj = ResourceManager.GetObject("help", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
         internal static System.Drawing.Icon remove {
             get {
                 object obj = ResourceManager.GetObject("remove", resourceCulture);
@@ -81,6 +90,9 @@ namespace ServiceDashBored.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
         internal static System.Drawing.Icon up {
             get {
                 object obj = ResourceManager.GetObject("up", resourceCulture);
@@ -88,6 +100,9 @@ namespace ServiceDashBored.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
         internal static System.Drawing.Icon warning {
             get {
                 object obj = ResourceManager.GetObject("warning", resourceCulture);
diff --git a/ServiceDashBored/Properties/Resources.resx b/ServiceDashBored/Properties/Resources.resx
index a551597..5f19940 100644
--- a/ServiceDashBored/Properties/Resources.resx
+++ b/ServiceDashBored/Properties/Resources.resx
@@ -121,8 +121,8 @@
   <data name="accept" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\accept.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="question" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\question.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\help.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="remove" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\remove.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/ServiceDashBored/Properties/Settings.Designer.cs b/ServiceDashBored/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..7fa6bb3
--- /dev/null
+++ b/ServiceDashBored/Properties/Settings.Designer.cs
@@ -0,0 +1,37 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace ServiceDashBored.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        public global::System.Collections.Hashtable EndpointUrls {
+            get {
+                return ((global::System.Collections.Hashtable)(this["EndpointUrls"]));
+            }
+            set {
+                this["EndpointUrls"] = value;
+            }
+        }
+    }
+}
diff --git a/ServiceDashBored/Properties/Settings.settings b/ServiceDashBored/Properties/Settings.settings
new file mode 100644
index 0000000..941e697
--- /dev/null
+++ b/ServiceDashBored/Properties/Settings.settings
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="ServiceDashBored.Properties" GeneratedClassName="Settings">
+  <Profiles />
+  <Settings>
+    <Setting Name="EndpointUrls" Type="System.Collections.Hashtable" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+  </Settings>
+</SettingsFile>
\ No newline at end of file
diff --git a/ServiceDashBored/Resources/help.ico b/ServiceDashBored/Resources/help.ico
new file mode 100644
index 0000000000000000000000000000000000000000..705634a8ddf1f9088e0a48bf2f1b7300acccf558
GIT binary patch
literal 68790
zcmeHQ3A|0^`aVjy-IUTCQBh_NNhCvtQr-K%saqOp5-OomSA-0exyU>vWIjYnhD2T6
z3gJW{j_GC|${gPR^L%T)Ykzy~wf5O(>ZW_o@AsXx*WPP?-}^q#`@Y}%4QuVBq+Cg7
zBo!!-gukLm&2lFtU5i(pIyvVh^5shEgZE0{l$R7m$z}d0CDp?F>HTd;+g57VzJp!&
z?cKd-@Ai%BP1(J3(e_>YyRKQgp;VmjpULm-+4Sw9Z{Kezb32uknXS(?Wp1ZZvK;U2
zN?U$t>-N1}QOB9SdUEgo<>-WUpAM8M&GXCq4=2gwCzE7a^IS3&WzrK#G9K?u#b@gl
z43zD=4@|)KJ#BXG{iW;L`GaKaL(camKb|D3rnZrve_A7Z($>h-XUoa7X3l54=7)I$
zW#g6|lp|^VhRr2*ZCrJ9!V`azDNU1P`qO9!-{1Jz+rqz7C{v%SE;Cv<pYfUrPn<13
ztzUk0*|(`B(02DPM?EX!P;Uyp`@yqGGV7Tn`D)-TvUYYySv|eI%xrb3eE6L6Sqkdm
zwfxS;&D*>0-nsLiv)W%TvtGDBrsK0&t)MsB_-5q2vOn#gvh(}TWYSYt$@J#<40Z7P
zGjZ*Q?JLWc&71zYWAnNV(^_9G3*ShVS<jy*V}a9%dy-`C8+DER{I`1EhcfK$0`l$y
zsN?wp@+q!OX>*NiUi;mK?VHwZnA+-US@3#Anbx+VjC%Nd8T8jAdFOV>FySBgHW3i{
z@yjn{_yfgd>I-FMes^5k`Wo4^Hg&_!?K}QCz3uffrFAJ8+oHV8>DfrW9Me`lAO4aI
zxFauKzaXbhoiufPK5~$ZY;v8scE(FL$fk{H|J=TNfA{%sKQHgxU06mvRzg<J9%8QL
zzfT8sMLlig)X5X(y`@tp$*>1Y;MyWG|LqrK-Nr55SO2iC#J2BO9qo6=bu#RciZbP;
zJLJfLU0xmf;@IJ1GU>&~WavW`<gGhON?Pi&qf5T}hHjFyZO5*z-%J@TZ`8P21~;lA
z(_d{O>;E}N_H14!d$;^3>z6E)ln&3xz<Y0yH)>uZUr!z-KWs=d_QUVvFZa&9`zCxn
zX|(jJn=CzUDJ^gR?FJe8a9zk$53g^OH*1%aUiB)<R})9ermg>uvR|i)q%*f{-_dnb
z>WV`jcJBZ=?vTC>s+%&n(VfEgHm+QDXkFT-ApdczNJ?6ny1LZnfB)2V+vd%SHvRDZ
z`b|HqS-&MMZPAaLwsie!>GBx=-G5$EQd-`mq=oRvPPx2lLSOJ2Ud!+By9BTkug3ct
zXOa+u{tN%|u3D8^GBx$PYTtdgy8i0bYZ|Uu^L-PPmMHDq(h~1C!RHNeU42|%ZN-X}
zC4m*t{NLZ{fWXR?tIh#`HNXG<`)2Fbt?T{ck3Y`bxN+mUw6skpHgDb{TefVKty{Or
zwr&5GfB*ZZn8Nq@Ij`gO_@3bVCr}TnTQ?K+_D229&`!;7zg=<8>43=}T*iFx*;;GY
zuI;>G!-mD1Hf=se{(kytyX@GpQ+Ds(BYXGmll}Ym%g;amEWiBniyS<7P!1hBB!>?l
zjwyVfpYu9i&+qa3tcUfnUe=Fx1nnI|yNl6&XV^n6;GFLdj`i<CJ;dgMKm71R3;5(*
z@Nk$uOK$e;*=zVBcjWfiv14-L#0lg#r?OmF59?#Ste<wl_Si1lr#(QP!;ot(<ZH2f
z`L_js7hwHygvg87+YlJ1ATA%HAJQku1O4^r(WBYMb)xn{n_#<apK?$h%Ef*Iavp=c
zDToUVLBap>hfLZb`r6{?cL$*#-pl@)7#}!r!1&>>zy6wKzfP3vM6RPej1QELa#CLA
z50HN^^caMEp?D@?_^<mK`qVP;p>fE=PB6yq+qcj3*}pf=!|Z}`GMAv-l%M$|^f>{&
z#=#EC{MQkhpu)hX67s64$gxiD+O^yG5@T!_&KZ9n{rE4tWdGI`vSal}viYm`<i`d5
zOyO(3$Ip1psZ-gLJ5YYc1nR@w5&E5ko>O55l@f&I4}TfrV-fhrG~jcJI5GETzLjx)
zom}tdpH|DddA;SU5shSixAOAgiv?xIGiRFl!x@<WORsRAk%ixxh3~SCuZA}=b+Ycv
z$VGjqm)ZgJJq5j|EnBv{$RD2Ia0T<Ae{6@G>Cn!dyE4uD!Cf09by{1Q*R`BXe>Sg~
z>*aiJghz{W%mL3xuUIysb+A5`X_(_>8}qu9!#s9dVcQw82ekw0%UluqAHrNyJ3y2t
z9Hu|sC&-WMAU|5OeftiRKW8+~@7ugwJ|A$qOmBHM)*>8U$W0*c7T;V0NUucMhiePA
z9k3l!(C$>MT~G$fLYWe^1?tOj1NCQ~2t3xHPpI?9V>((RjE~Pn>>I<rkYi}(%n4(L
zetFrr=JLVw1r6@RUb$EQRGu`(oA=2Vxq2!|rnqG?)^SY1S{B!{^jtsZwRYVztazer
z*)~8~rl8DdQ_#qG)Z`FOe-uwY>Q5Yq2XGPKGv@2Bzd1J=wLiug=GiO2*4Hv8W?z_S
zKEH3%QkmN|StgS^7v~`Ex&B7Z$RRnM<QC;NGe@n1N7l)@P1|m)v28$QqnvE(lP<|Z
z+2irg&xix@ATEprz-cY!kShE!Sa-BQKi3T7pd%Ua`CaQ5%f}r{Ilf6uQHZh4z41GK
zmJM7dY9DG7QTE{W1(eV5@7lmb$VDBfOL}&ov4G=6;B^G+Pc2S&8$fPz9^%?0&WEtS
zJAV9lx;X4f`&vHy$2Bq$dkc);F;-jLE9c&48q33u<RY^rtWN8FwFm7xJR86@{ET``
zz`h0QMBU=q0r4SD#Ebm_@SF72S6^c__w@V2_@>atjcKWjYn(SfdGcgj-A^1pB8&Rp
zX|N(@^c~}qHh1ayxqWR;y|%cwV}{y+Ir18|k0bR^8+adfu;}eOg}R2>0dXQ;#0~ff
za7_K?o27+LCksFyRs!oHn>gO(Tv(W{`u^Iv{jirNuMi*lN|f)req>`E^*SA%wO`K6
zG2OV4h%NZ|fB!M)*EFwCXVpLGNZg1Y*O!3jrlm`lnLRPTcRRpXrV7TkyV=(tITCK?
z)cNSoJ7m^BiVHEZxu?&lKSgn^c!zMF8ICjholu)l*{q}L;Ew^+cl@K+F9zL-K@k6Z
zkN6Qs&J_UH-Iy<`@_XhVYoHB~zZ~Scd3s~|t;<tn!jpLn4u1ZLTcW(D#~<^B%$D@(
z4zvY}f7L<lfU%8suKbT{g4a*v5n>T$1H_SdGA{(a2VnyZevdZba(|q%rZ<1PWavXO
zwlVfwLVx;!^6!uPik~0nc)a+zHsg5Y=b1VB>x$Q|Uq(-M*B(3@KyG96PaNKRBuR)#
zm<<q5%Lb1B-fVy|U;RE_j(_~{KAG`i(J1c8Km8)m=Y4TL2!B6Enc+Fn@A%sak|$9+
z2(p3cz=jwF*#U7?8vx!1kq`VX`U2!8CE4Gn=l6&AZjnhX3K(0reScyQ_Zj3pQU0>?
zI@=a9Y6o5{fbNWe8Uq*yCN?i1#45-JG!8Hy0PednF5n*3|JWbKCRZ@eXO0rDzu&)g
zCHlEP8Sbeg^&Jnr8SnjZ()OPqTov~WajA3m898R4&rq3y<hAwj>q<MA01U>teE_i;
zgZl)=KmI4IMXwCB0pd)&IW7SHn=n6c#ec#8FgI~7$M+ng#LM%yubwAko8&fnQ9l;i
zJntQe!Xq7@SB%r;J%D4*4QI4?>pXUS>DYwI=(mF?8=#(6j%Z>5u+SJl{@=xYC}SJv
z7Gf6^2Z%Ru=llS8Nd5B5fBoib2AH3k$T^C5<9o{g-os}YeW;hmy+6OVxc6hHn8xMZ
z<tXKu+~z(S-b*v%x$|XuHkBz&&%_+_8JPdi<*fa&y*Rd@GW&IjvV#B{pkFBe?>@-a
zXN1}SaVP$qC&XOw#NRRoV1Bwe=O{T(6=a`$Z|~+6@*ZrMdeEM!m+|`qxmOJ1;jBKY
zzP+f=&3ao=wjSG;zDZhMbe;67exVmfwC#BEsSdUs#I*rn!#F^^h}&q|z$3X0mO(fZ
zfARo61Zzgke+wHx-jR%4{|M))!{&4k?%pJ0AI)dvSN^k=d-Zo54fpQ;j75EOnE#u>
zzuT7DTzYnpX&Z3)ABB4Z$2Q3)#MEyC#GgEHZUDR-!P;?hPTD|f>Ua6MhRggTY@B!e
z@Bw+hX#t_!v|sX1n~oaar4#Q%eJX@^a>BL$#W~D>Z}87{JR9I^*9H@@13M1zbx<tO
zvB6m6NyLvhj=CQ?;gbb0Harkx1LT2xaP1iUtX;C?%ltWI1L$kUu+NFNZ(~~PqDEfj
z|2@S0M7UQ!3FJP6cir!y$KQ&7Z7<3e60if+(YAwlHo!hp`5)N`>))-4#_-RWKt41V
zz&@feIl({X9O`nP3im4b<B*<zF{H6jPTDKwru<QPeu&>IE@9lOkE!3;_<OIhS8H*<
zoQ?m+|Iv=urW<!c?I0jWR9zFY0gMZn3lLA@I^w=0`5YK4-u98akRR|Qm=~y<%{Gt+
z@nsF;OxV7i&C61ZjLJV_SIqd{<=@s_@rdC*L7$&aKHPnJpZ^B@b8nfp>9+&5Pqo*u
zK0$T1aq!}RZ(P9nfzj|K<$nb1VDr-0^#byu{Q$;<Yrub=?6Lvmm+iP$F)Z#M{dt$X
z`*2=kpUOYyH|=q*>Syar9AbE<&)D3%{jDEs<v{oPao=W+^IzjaXaBHkZz_XdHrozV
zmmoc<zm11tWaGxZb3CwA{)Zz5j0V=k-1dLICO_nf;{mJ@a9?qj|1if?6!VRTm}mOi
z)AMQ17Z=LK_(VCG@7X%2Ube3BxL5yC9Ha2H{M~SG?eF~}hyA~g@~>^iu>+M|buo4j
z(jVBkC{{Lpv;oeY5MSav>|Xdto8p0dkSER$gSSJN7b==n13=D~!u{%D^Sj@F^0tvj
z`Dd(3FW)2gf&9BUl)=pETRr|=ylvj?{oKC=|8{%cUUAzFd~zE*uyaG74Ja0B10MhE
zD}8H+#8&wq_V*-NGw1CX8z4{Qi}OOr1yi!Z|LWCiu8)`Voj7_(Mm?BUC<|?peG}Jn
zRBl@r)lc<}iHGsH5Ak`M3%*|RR?g;s^nZVwfi^&SEj!3A8{j&r;U9Pp#j}KnJvq=g
ztVhiS!Jqu=Ute9HSsTFpYAKv&4qMNk*Yge|hw`84xSuHZZrt^AFta80(xChn{A*i&
z8EiWU$_o;)0re3cJ>T)=gX{;0H~D9o+vAQH{>c}41Am#00kEAi@cmO^<GtM*zV_sx
zJR>ni35xr+P8p8*>BM{GLXS({&RPHOTk}F=XWAZ*wjJ0u;EfY97zb>;{5C**S(sxf
z|2&cl^?f~BG2j$pK!)!-M*lHBp6^e7?rKj4@*kD&2aNNx%Ds&<U)vn;`D-k{1^?QX
z-M(KoV+SEQK}O<$$G<NZ;GP-ff5_di32>pj>rrEXn+J@~NFRXQu{h?GPaMF#%UYj(
z-2VMSVY?~==Xkw7pYh5!&JXPK5%ZZ72j+S{zqj$Vap!C0<G1FY?fGS~<xIo|g2sl5
zmBs<Z(#DrDfVm*?Cl7-gCJ8yQIpS;b$F%|Qc>?po2|t4Z<HvV6pBR?&Pi<4uw5c}0
zyu_2w$369k>-$!GG&xg(+}phK^@n&q<Cpz&KK`>Ef7`YlWXc8t#stbgkA52<|J+Ba
z+z+}7^9bO?&p-JikDL#{ezA8Fi~)Hu*SBXMo?qdwkLSD4*9=B`v^lm<JM_2@@%_+T
zAKWt@dbx5YxF;W4ek=a9J=+d4Y6GSpp#E+g^kYPyQ5*2{PrPXZoMR^s<bTlLk_<O~
z&d4LzhE}dzwFmsC`#d7dA2;Nha@f9(l(ywfd&>U=d!8>5-`AMWqmO&$%{sQX{m91F
z#$0*O<8RGB+qLDf<+SD3zQ8{&h?fi4{D;N>V6XfS1pnm5&p&x2pIjHfUNJtCD()ZW
zd-x2apn3iy2X;8N=K4SL(5(2r=l8UOEOJjS{*}Y=zhA8jy;!3*mnj>t>|SjkXnxSP
zfv^}r4(R{npD}<O*)~8P$tUwb>=B7OAB6Sef|xrz7MAyYF|4T!{6DuXwD~^rP>=tN
z_&(#Fg@MgIeMNo8_9xrVZ0z}Zc5A16-m{$SS--%PEz3Taw6B+BOL_CAveKzcVHt8~
z0k18;47Pl>+^UO-0i3^potrq|>Tmcb9s&J;&3{-7;8=j%lb3h?iZu{$Wb@D0<dbv4
z;P=?)pMMehd_vsA(Spyh3tQ)Tw{by_f99U-gTnZy?EXG2FyB|d=P?W1s}1n@QJYBl
z7_T#1?0W3_^>wCfz|}X#1_JmeezpzxV*v4IVIHRZj|NA6{>dkK1;6YALhma_jF=x5
z`}b^IYV1q>pX<`x4>_at1;|r!nH*K~6&_>w*M8sjd%jlwE$-<v>O;0)`SDgB?4xoP
z$occIh4e~*y=a|wJNnu$lP$06pfP~Qs9eCpBCH><`L|<$Vn4ZQF0)Ta`5%B7up3<2
zHsI?6=7%Hz`LL(l?CZ0?tFJ%m-auG4V+`Bkm~YBcXUNB|UI!aEKZ^et?m4~*;@{#v
z$oFk5{WvTBdQ^^Lc(?eT^ForOSEB60XA9bfwy8(IY_{Bf8;IKvWFQ92Xm!59esa?@
z%vg}Tke~j4LF@xp%9|d!F35WZFb+5Z{$rk3jQQT$e4Z_zX{z6`kHZ?B?eRYx^L>o_
zDbJpR=WZp-M;(gA=Rb)15Z_n4cvKwy_$uytR9>REcX_w@{sjD|SM2LOTd?dv+tRl6
z=$BDtxAoCDkd+vqeZWWUiy7?60sDYq=#Q2EVfURK!y$Pkzg!c-x^QiO48ZfOyM)d8
z{IX+%u`BieF>dVt@TEdBuUkc#i|3(DZ<XJBK1+=M2k~$DzT(28;-&ccaaFwaNIs%?
z=Q+4n9@FDH-sf6}u>)T_Y*%H_qhD6lL3OhA46=cEeSqB$q&%13U_P&FMIi_51K1xc
z|NZYw5^`qyug(R5XYLQ{;^!Z0MPG3LP|$O;zaHCGSZ9C47Pi5;e#ZV!I+Zs3&+C>f
zA9uLM{3c91?!$6^#YJ&a+<3GxRh;!0!##N4Ft4keIQ9$5K{<x8Z&u5MHvf>;mlc-|
z*A;Pc2g?r9vjJNV)lGE`<sWe|-dKRYyYo@|Yk+$){J)~%fPDb>2$3K1^!6P|Le6ad
z$t(GF*95<?`A45{4*G`UVS9Y0v?=HDKM3PK#+zwR=QHio|4j_Q^A~5dE|6H>XZb#H
zP)rmf#m(lPua$QmiG39RZoE(Xv`4ny`!V~?x6QpD&tFk2k~_LKpfcEU`DIpJR5#Vt
z@DJSs$AbZRfcif%X1q1HgMZq<)E4>7b7nXWRQ@M}Gn;?DwsL^uixw^Re!~Lm1GTu%
zgZGp8zr*t(_vAG;#kz-Mp9lN?587Pl`hG?8yF(@hyjmP%zB8i7eF?^X#Yget(Z<ro
zSo!zjzRNwYU-xmBY~}y+QR5B&y#Hr9e2>2uW%ma;5(7f`p9*Y02FAwsUB4s$<ig|t
z$jj*aEQ9aP8^a~}CC}hnzW8EEEsX(~8*COf?%%g<wY+t^Qz!Xn-%tK$w<{XOKYx3Q
z&tUzq?ZpxPE$%ZK`)%&|+U8&Vem35x|IjzM*O+6H6_cLNR{mFgG|%Jz-TTk-o=?O!
z**0bH+kjtowQ05Ss2G4cV&(!u`hX8#yco|yEa&>06L-l!xgh_{0mwc1daFT_?Asds
zykeaP;9M~F1T<6ru|Cw7xnIyepH(09^7v=nob%(@Gt&1v{!jkrvrl@hl+0-PC&vaX
z{=K<g=u6z}xKBJ38^y}T(B_`6`8-ZOe~)>HDd1h7AN2L;$Fr6HBR~HlZ3>k&Hqft5
z0q6NGY|m|*^KX=e`q_4B%da}Aj><oep?LtXv*(0~>D<nxjPDy?v;3c2FbAY8Hvi<#
zj_2f8*8`CQ_Er8d?=ze8K0&$P{JxEhEzzdv|FpBI&CiPJ`wjQxA7w%J3NojCQRFb_
z2NL98aZ#LX>=aX8!{7MheS})5FN<<P8~A+CJ=w}XD;x3Xvxfgyt}E=drERM$-22AY
zjE$7luY>BQx~dH%!auPjrt`a1Fc|y!XAGFq>@1T582;h={ccN=d3_p1@lSqrEdcw&
zXDk03H{$ms@!THUR`m6hHuzmW)JOg~??e7mTILVuAHP>PziU}Mcb)f2<}$f#R$@P6
z1!Ft+y=fuViZ?M=E@%e}deqK#{!>4m@Ad)L%E)`qGVR&CQx=s?kL-&yCeRi#%YRA>
z<Q%|~nA(1(c{jOdnf7dc!$0SN$QSva4DOUiJ(6ee&3%DCy8Ls!|3p~sKk}gqO<k;W
z$lZ>8e}Ly4Yx}lL{H;n;x;y>A2d&S^H2)ufck;<TjrWnUD7HNMZ9wf{%F_h|KTMhJ
zHZbhr7RCnJmnh`LAC<wDOJ$|pEbK37!<ps(gI1VhL!Y_;m=aqXZ{>jelN0*pkcJNT
zeQ(7+L2#$M>ybQjKLDN?a02}Ew-HNlZ76J?=YYTF_W0-h2aIpCUb-Sa|Fi@219LkT
z!*dw&#_sR1#(e(1pXc-)y?0peA6Hy$tZh56<H5cyE3%#cL;Lni_nU4vHt_n57aIHX
z%c3$G?y)D1vQrNh+On;y#(y5e`hXcN^U5c{kXWj3h4D{L$o~k8&*=N)zdyKB-t|bH
z$v1eH#fv{Lfi=OZ+#?n|_B&zfVO^|K_xgPF%GK%f{|0RUzdPIEO6Zr{u>tsjKljuA
zkp98`oxg=^?s>)0Zv$bmz;6d@=MTts{#oI^Z9hrpN_C74^t|~3FCInlPQSOfS6z4y
zCv~Has<YZa5dYJG*_`%Q!r#k#+{g2Oazg&u9{K8n!lVDUY{)bD2JeEk;Hnr4*5jBk
zXx{$_?lIGP$iI&LxaOm=$F@hcQF8?UpBft|Cm*-F3^st@U<u)${Uq-b=UxUDy?>ax
zsQ)OY8dnu_zYp?!LGK1R!apnhdB-m4S@&*Z1KlfMXfRQkR7REA=3aGU45jSUIgEc|
z^${>z(5;*-Acoqn#)<#rg#1$$<-bq;*!>{nS?2(-C$t{c0~&H&;1K3YHAd)h@8*@l
zI@AWp5##@yjwKW3-`GI6GV;;O7hzm@W{m&yx!J@<?;lf~j19Q=kt?2xuZK5u4YGr=
zjdMv(^Z{yA#||Bq!S^>cHqf!`Wr&NIf46*|@*3_bKZ@$4_wN~9p);}c$A7~;u$m9d
z40Z|fPfo}`@gQG@H*iM|l}{eYv#tYyfBqJ7W9|<N+Vin><tI`6^O+Qs`IF9NGQ|Hv
z>d>{c%zmk$d_Wsu|BqO}XTa&bL&QXFfH)B|+Xmvr0@{Px0gsFUiw8DRx^m=r5@V@}
zFLX3E(5`r4^t)%6SY`XXa!-A1?s>1A(Hrx1eD<5^6B!$U&Fr=X4OZknBm9#S@=x8B
z|K9bIgdE!ZlV|b`-nkCg7{_PA_+P(hoUjg!0Xn{&`<grdj5&z(;y-mD{|oWk_6xd|
zmXBZqv~k_Pt~eM>fQ#P-60!sO9{XLl7#nDOCZ4yyG)K6%E1lPWm^^oJ329rTs0{ww
zS)R?>KCj%Xj;gcXKS3<`dt>wu`U$bhDF5Vy{EvlCkuUPryKa(@!#Mmu1OERJ#((Op
zei8mrr|$Qg+oeK={omNYo6fj!+>;mLe$m|C{UgLd;{Y*=8w=b%Aut}eF<9*&<;82|
z*P{n*x^m=o>YN4A_Nq!)CoCp!-+H!*U4cID`n~ebBgfRlV(b$a%3O@|$UU*jF#q6$
z{BthE=ARtK;r}1$@(&x*7?4%|=ObQBd$FQSYE@d^d;Ag^c3+-Y8$e79vw^5s5MT%F
zceNkZ;}=68%@NN1mHxD5t#rP=4r0Nz(&MHAq47S3dtfl;u}fs)bERb}u;ExftNg3)
z_o|a53Gg33{*!;#2H00Q{eRgE`#<%X`U2)D-7>j#SsB~(3K`xgAACQTX9pS^HC6`2
zf-pO<V}j<4Jf?o|x}UBbIX}2(pY*POkI4yMOTH))(`eHuHuppC$z^nZ?@5f?Ta`7q
zOn%<Mh*)LR|3B$m)`|b%$nXWu$bWkAANhadu>7C71M5)!z5LJH_mNotuiQ^=Q&Fg+
zX9I1@%eZDmF;A5r_?!`iPoj1Z&lWTnqYbQ_p1teBVFq;U;2{}scN1d+ua>zqN~Z|_
zXUK>L^BdhK0|VkgTns+IXbN7>b!{Ng@gLWKH2))C<gMo|vH71b|8I=(f5WixKgSNN
zLv29E|8rg~k+A=Bo`AYdY8}zf=<3-)vP^j9T6wogLB##DqVV$DKv2KHepYj>7+Y}1
zUup--CwB;=EnD9|aqPGZZ~U~efmcdgfjL<xzBzsUS;9Tq)Oqsr_+2~l&O+ZnAx;xf
zCgC;xCQ<&$3Hc{S%00Q;yLnYq|L+_BH^e+py|DSeBL^_o;quQqIe*3Y|8a+F6XKs^
z1KRe)R<2IeOYOkbTVnxpg0W9tE+ZcJbGos>wgY>-;I{>}3vV0=dssTYEx10Ft$YVn
zb`tm93~uyf#0Kt$&qKHOp19of^`6hW+!Gh&-rxny7zc=9Li0c1g#2?Xq5Su#oh#;k
zAm997J<J1F4WIu%DLrdDafEe_gs+kR+3l`Mm;d>gt73nzx&+z)Z5}$R4NQ5yg1rB9
zF%t`hH{x?;B6$I0rxy?09MNwFep}EST<t)QpY?x0PX2l{h_-Bf@A%;((x<_F#s)ek
z7cshVP0r)q@_9e^#B0KH4u-Z3*yC-TgJql`C*+?x(`S2-w_0bw_oIJz%{TvF73)AH
zxE>U?{@3revz)q6C)bw9|E#u`r_2A0mmT@3gWm>BeA77K+JJ2blUkLLaZg<-qaG;`
z(<g-4fj?jL=Z$I$dYsj<x*Yvwcee5!RM{b{w|1;h%h*7l`ej1nJu$IyB5o}2x2!0{
zQe!|E|Kx=H^WJQ7Pv7r%TkIY%YyD3?`)m<^Q!FpmgHMF5{|~+IVpA7wYQUY&`u~j9
zSpS91sr}h9QO?<~LhffB*;Nl)H>0Z?@51_nDK8`=PL?ubgi#Nj8)yeHwqV7DFndtD
z;BnG(#pJ+GKLpX1t?#X0^0l<Oq$I|M*U8An<-LC1^Z7X38ytZpF|~14><tg#VtT8B
zX8oTWk^3IC&XghdT@uyza~{B2|2ONu+yj99KkLKx|4e9E33Z*}*c0ZJX=5qR{5h2W
zxm{qlu-Wm?L~MXI91{nEa)N+ZVC<k}N#Qt&@gS&Q(7ZaTe{jcKY6oG*F^^p!KYh0#
zTlo&EETzNiCI-B8bqSf+GC8KNSN~9-CuZcHI4YK(ycV$mKmXIf34dp<FXrjU*PFF+
zgNI5{{QLI*=>Cr+?Ejk`w*T*wp7)!&SSMoupXWQJS#I!;xjf|dEVf<JrpLK5tK3Ex
z*9KzjfVS_C1tE689FhG3#|k4KJO?o$dJa+Tz&-}rgxZFC9C3dhS^MdzAlkC+J?<Z9
zdvzsa1N|D5H99NjJZhX&tZeRyCkwGvtQC95|M~maxy?SQp74Eg&oZay15y0@_WybN
zzpx*)Z`l6d71MjW{O2}y#W?`(|D4l_dl94gpV`ilQ{}a7H*SC6#)8D`fa9cc^8Pc$
zO-%4?0rP17e9^Xp^j`D3ODDdXZF~n+^x+$C8U9}=TtX&1i~fyz`?+VoY5BckX^u~0
zpARsm4Jh{HpImVNC%Nh2a{ornJhCFCPZa;Y{lDJ+Ps{-{;~YTH9+16T*T@?+&vI?x
zOwoJ)K79E~PX@~K3F7`Z$Y+XcuPVD22dEq4TAcnM&;|nI0mlund(0!!7REL$jCs_H
zFt$ElCO%tSW_GM4<C|kXzCj-8TlY^<^9u27;qzh5b7cP*?P2ehZDy^A_Yw@eyPU_p
zVq$#6<zBJ#j=*+o3kP3fZSzkq*e?%<4b$(*{Tns%3c0iA{>iVd{bT>XxBq+P%2l;^
zZ)oTkpuxGG4Gg&R4AYiB2b=<q#x{@0=(mHYSYX*eOn(p%3%nc=ZA^KglFWMTHu-eG
zWAd*tugLOg1LXU8Q)Tn=FR|Z!GsbntJ=dGlXQ1)7R+nBYqaQh6m`AeT;5ghVXXD7?
zobxkY^Ue5IygIV`#an-Q(8$y&xs;dR8~)??Jh3GA247%28U29apE-C`?staa>5Urs
zq+f&cqPV9WkYD#6V8Q)AwV3<y4|_q+!F^%J!|wkZ|8ynPo6pqUtInB*|EVqV;yxs2
z9gw-{d(9&9sh!5P0beXoJDA+2GWfki7W98yz8L+AESow&)`akz9yi~9@Ug*~{`Owe
zQpmdycQNnAIfnOJTqEOKTx|+p^F4mXYnW$jUN$?u>NEAZ-cQ!%itC(MNE|Z2J#ij`
zLd?lMIhfKsugU#--a_98Pc_b#aV;uG@z31Py8rL^!iArC_kYm_a9`*bVfX(o8Qsp*
zsW!lMAm0C}`+%75QzpL+cy<ubA9#I&6$^H6#9oz?Co+X=(3f_s-{A2-^nPca-J5H2
z*P+7BKkRZFV#%?fYP0m->bVO&nMO6K;N|yToL8*W=Pkci?uj)qH+?_${qX)z?tfM8
zU%&YrSpwg&W54hI->CaP$v@VCx^NvRXdmFu+c(PVH~-nQfuWeoWDdwVhgq*wly{%1
zWcXJb@a%xHyM0z7v0(f6UuFs0pfA5#zNW$Z&6?KSi#zx1&Ao@5Z(Ei9<HGH0fAsht
zbWeH1e-!s_4rSuK%RTY5xhLN5Hbp=93JN%2?l<)AGYvoFzI*ljLe6ad$*b=B!oHuF
z`@fL`)Q*<}ymkA9uz_<-8-42K@#X=@D`hb<Jr#)qo(;sw38=T77yR()xF8C%^xpfe
z+Z()JE>^-@W6`yi^p0!hj>uBmL0{(nQT9hHZ~wKN8P|FI+uRd36r1~Zfv<A^Zqv#p
z*Vb`=pL+QWKi#XJi+go0isIhi_ha98%<~@*0`g%V=t$V}e`a+28|>;_&j!X}k0pPj
za@fNq!GC3x>!WNyV}a%@YR@JPP*06>?vZxz)wtJ!Aj{Hwo0hHg@E-n9c{7G)KAA|_
z_|=RowH@?j&I2g_Z{6wgZ}T1!?<3p;XM=ZT8Tt_R(ct$1x!=|C`*Xq3c{1bGyQ28_
zJ^v^0`7i7P@O-HGVe<gHeq3(&R~r~|*I6>)jy&@A|6T6MV{E{U1>|3CAkkPbr&r@3
z$g=!i|GOF+%$alR+;bwwJ)2Uq+_t}hJ)5?A{13Pb{M+0I_&hO;_<V%>(N9)E{3rwt
z@?y?EkIT(@(ydwnAy;<n*Kxo5{I9U*KP6!;xCPe&!=C^5&Rtg;`=Sl>tbMlW3wqVX
zUZ+PZ%IGI=h{S;e`h%dnVAAu|k^lYbhb+tIyVJJFOV?a)aPN<ptMe}Ljx##c%aQzV
z>#8*#|AX%>?~LnwKCgX!#OK-HJKPgzazEnH>!nxS3*h&E#+(oPd~$!jymMEPDDG(o
z*7N^(&qwI<-|&3Mg6IQ|h4lfS4tUnI(GC0CoH&plHgJv%{5!_ikSSsV;r)R>7WnO8
zTk4`L^Bq*dy2W40%f%{7t4ptw!GDi$1Cv@;!uapwplY)G-ty_QJ^n{Mn(U3~?S9_z
zdG&kS=N;}xKT%Z%-g6zWXS_dG$OpOaR_y|eo1cy1-xvFjVcZw`{73cym<vwfeqins
zvSSEeAKt%HUa!t}P>c<n2m8y9J#QDu$VVaD6E_+=(EiEp4`|Er`UJIuFGjb|GR9#Q
z?AovieP(mB4)<n_GQb{tkKA=uJ*Kp)Et{5p6jnu+-=Ed3ui?MV6(wTwyJ+4cK2JQ2
ze-Ym&s>z5ZRe<>=j?Y`%cfaWZ!;#G!c_g2F<^!Jn829<F<R9aJhTIPj_WbX0&8rzZ
zi?V?l1rP&D8rjqaG8_xo_aP2WY+YSW9M9Rk861PnA23|rZ{1ENw0=hB_UkN5rwo@L
zm&}!4kL7IJ0~$KH$gAZ_MdkL<+z0u*!~LkoZ<2TJDJ`$paC}hxzH8NjGOqbeF+OWO
z|C{%Fru+P7m_S~v2kr@*3);DEsmuQb&he)65d#WHulkoE22>Tw$N1#*2UP-d!?>{k
zcCcyLCt3Eh-(v;L{aamH%J_fZ+sb<JFsPsRe4hO(@FcFI9<L7HuLi6yhwr=iBj%I)
zZq*9Pj&;kT_}4if_xb+`J^!6C0P8{Ta8F=Z9yt1m%5Iw~!}-!3_rtz(cWEP|V*}M7
zx6>cQ!~$P_NZZ%`kH>j$HTyl%mt~p095=;q|J)_m2ZFvooOkW#BR)^=M?PKydyC6}
zd-CmIPwu<me)Q2#+z`dR=6&Q5d<yRMOZ4|2xE@d(dEkk#-~ZW`x>&m2SkTyjV|$e4
zeCbi=GRy~5ft)wH_Ugt0FE7wBf}0=4v4d@^awZSVGKpEJ;PspDH2l9-xpd%|?%k#~
z@9Oh689d4T(1&l79=BX>xF_z)eOK^LPV9c)_xnF5koOg*ZzuYP`QY(fD-3%s#PCOw
zVRsir*+BQ33QE5_ip$8yY8YFk%|>EDP@fQP2Qxa|og-txEYO#wuj+HexCd<L1Mq!!
zJg2#`_LrvbM2@HNp1hBIye8s)4PbjMo<R}uJL3OZm5XKg!^u(H(+<cR`2&x9*4Ow%
zdDrU@1Il1c@Kjg~U|-X<>P5x|7=JVlyixNK8FX(&8Sz+6V*^esu<bzm1UonI+X3g3
zE6Vo^-p>-|zn3p_AMk6H>l)whUahQ^6S;Z4>Er#e{$_(8aUAhzO<>A3*h@U0SMIys
zcyUa>uf7ld_?(|p*yowy-+!YWz;;sN#enG@?uGqb;<JH*(yLw(^aD2;xuflXISl&*
zJ2wci1N03O+T0?CaSy`j{x`kjn}+)ri<X4`I*-Ho66SU`?~z!qypMRamcg=T-J*#5
z7n;7_;r<foT=`NV2X@>K@cneheCqT5BW&k-<N@aQWSL9)+xZp0J=&x874q5*mzX$2
zxflz&-E@)kyR(E0N6e!9jt$uHAlMF~^F${m%<A?K#$-oMTN79@bB@{b)B3XOWYB$;
zym3(&?<Uq8p9gNhZg`WLi2Eg_Yqg7wpE2GOZ*ouU$$`xad9r^0mwUW3{rj)92jq?^
zoD&Y)8?@qs!H@;~-*9P^4ZL3CGU?y2yu&|j05L2Q3)rXGIU?f$^8@W0>^!luEO_U6
z=$QS_^vY?Y+Oi^5UMNz*%s0LD7tWE>*P*A^zeoI?{k-k-#&4R`28I<dwz}Nn{!+tz
z=j$&OVsCTL*W`(OG3UoRZ>D`;V*#EMSQO*OL;PL&pl5`z&5@5(c4UH0YAonl^<sIW
z)|E1-(T&JmYNuldc78y7)D9wZ%HK@tlhbr%YyD~8d@C;(zd<<G>vspZkK&zUIj4UQ
z<9$SvTV&vUHv+>V;GX{F_&oi-^Yxf(0p@=0$q#wrcptnSLe5`QdCbZY_lULQoFMlP
zaX#7K?vVq#u?BI4k;};E+5zS6S+AH3et`29w}jY%-7h$H5XljuZQ<J)L$Z~loT_Zi
zyhZY2(PU|Tc?s$Nf0f-_-kHCN@b1Jz6BkW<M2w`L0H@)N>j1NxrAOW3(xr;)?=J7;
z{>_?&a9`i<C?3cQ`5{kywj1_$w#y3VzVGJ2{PCK2x!{H+Go{N7m&MvZ)yt&!ttDj0
zLp6<Ffp!qpH_$KGHw4?lXT#d(`228Y?c&tQlfpgTd>+ip#Y)Q%#6D-<#?dL-*O}Kl
zeZ0*(xgYXSEzI$igx>>C^6qheImQu}VV-(s6!-K;9q)0TAJ6t(1OD>(ILy*1a>2UH
z1vxJq)(_0-*<3nRy4<k=*s03iwd&>4`?gY8dqF+}{a9k{z|IjOF(JqnroD2XZ2w_-
zW@*Zi?{Qt1dwW}5S^{JAWN>T8_yAug_m;maE<+xw4Sy*O?h#Kt-Y+w_65BaFTf}fr
zKFACC0Z-i9TQ^H&hkP0P1IB1SaQyi37&&N%L+-EW$;wz|3iRkwwGi%wEeqSO4gTu}
z*nuxc@M1!+EsTDmx_maYvmDsIIY;<Rw9>s>|1Ix5-4^%vm4L40Wypif>D)ORckCV&
z;~!;=kHmS0_qs9+m<)O77WhdygOy@O&RIHE#B&6It-tRj4;uHu59fKugwU7ex4-`S
zoBViQ&|1zZGtWGUc;}br*r5Z`_qJk2UX@*Sp$$;KArIDuzV(dGYWGe&@aG6_OmJ<%
zKYn0r82w~T*g+@xX$_wB1^fH0{+QoQe)%<Ndrf)dW))=My;zqe-+`P*d|mr@>P^lK
z4v*ABfA4aCV`1YniXC}p>3dso{FcpuD7=Y3c_1I)MZnM6Pd{ClKg&eNsQ`OKl968?
z;hHk<C-L*o^PhKa!PxXl*9NYLiU(bwUoYGTJ@|guz$5ihqV0gVgxf+qd#E83U%W@Y
zn$TaitXv|;j~vccQ{eOdIG+2UOE0W_)WLIL@m%!3U~Ka!=Q!AxTm8AOU$;5;c&Fab
zf9S*Y4HmuXl|jre>|xcZlEXW>?@_CW!PJj6@h1<=_rc2%jP;Y_P?v2V;h6!=H5Ull
zCqg-QZCHhVu#m9<>Og(ern^)rglDLh#@Mi?(VrNo9ndE<CdAl6)Hss1VA+EeBj|&p
zo7RyTogbG)!@J3fnPX+$;(4<1>n~;Ns+Ev!qx`aKH|CWh`}_I44nDt$d&Rb;uEF(7
zWbuf1Wy;GPWXJ>eV;oZrb6PioD~x60^6kX-K+fs!;GOzv8FXJQgT-q%DEATGJ0=%0
z81CAT8slfgUHg3S!F^rLvyI>cD#93J;>L|>!u5e8M~=kEM;qAk?Lz5V1^Pe_jbn~2
zAV;iRNZzbn0(%*5MqYTUhev!{@WqBedr-UZ*@kkaG1@(jeyX0Zkkerg!<RAN7U4I*
zr`5N;{4K)wh$c>MtM==}_gK!2zR;Pvzfr5C!NSJJ;04UO+)&71==Xc#P27n;$9kCO
znV0}&*?I}~5}k`Vrc~ZD!2Ba<epqdwTeZTD4fyP!^YvF?uJ{`1_m?Wj3E&sT4uWh!
z`-te+5FH=f+`;5l;DmXW%~hsflV7{A9j7SIk)xBxX`ik>?i`^P^+Or_Kz*Y#b?;Qk
z@(tpH@@j>`nCmYb$USi;-o%}AeBdD!eg3)GN^XLcVVrpd@{UcMZ{%|&xbEb)Ri5uj
z`wnv!MU7r++Zq$7f0rsnrPr+$Fh5?$!$`5RF*JRI$rl`Z@b?uF9vCO=SP|h&xl8;Q
z?bCJ}o_{l!HT`*XZ1;3<c^~rNtwzUQw<cq*yr{#y%enGS?%%9=mBGx9CGjQB#GCmZ
z@ZW?vzAF->D@QI{x^!7d%sK344oca=#)SuWZ^LtmuQfJ69XlpR$Ar$;7nav+mX!W?
zRYxqSj}q}04@axtRJ%~zbv&V**keqavy8u1pVngt*D9OKwaQFAoKj!j{@cw)N9r2!
zgTfvr9m-#cXSZG}2X}3Y@gw3&e2FvXc!2wEa9=V<NX=lSm}{<rdkYS#4TQykqX+lP
z;QOu@>PZ{WqF8jQSQxS3D&$%f<ek6Y;^L<G1=s_zR@{9@&n{fQ^v=z=lkp><_^%D}
zX}cXC*W^6Hx4yp3=t7;k+;Fu}N88tl0r6lNbZ=!LMqz$We0dKC@IHuKze)ya%F)Xq
zQv=9$Tx}pMAE0g@z24mTzv``az$39CM%}6vm%evY!5D$D;5N4?rp{4)EbwUal-1V(
zJZqale5<^az3&}28eOQ9t*7eF<Es^}G?@5#=Q(jyzjwLkZ+AAxQ8F`GIc)&3=^*<j
z<|tv~0_yeSl35tr6qWYnig@<#U=hKob0yqwbQ9Ols-oYlXW4<;1CP-*q36m^b{w_N
z*rP3n`}%<fMpnv9**jG%;_+^CPQ6)(!H-|eit%}3MEr;&@np=W-~V2@SCc`%R0X-o
zZsw;PqlC>5P(R*JGW3C}z~M^Q4uWl=WAc^Q_jH}{C1VG`cnHgbECC#t_k!&rmcvA@
z3v0ub!<C1!^|`&Ok(DyrvEAX`;as_=?!<st_zQ6(e#DWv9{c;>Tg+F^{YT`bB``MG
z#PKQTC^%0QG*_%Tf15HGesGns0mX(#+g}(XiRo)M6vH0aWaLt{@O)Kpr?%ifhT26K
zmvP?r*KM5-y6-k43uU5g9r2t`TW(t)^SW$Nqbqe*{p}-hB3{Ie_;HNq=J|Y9<7xAU
zacLpUO{8+3kaLurrw$t%P=D_6N@@2Xd<H%OjM|rT`Ub_XL-`1<yoRM~)oU@ATp4@f
z>mcUdhPk=hy%K5{7I%qWW7o^qY>REO?JhT7XJnx~K|XHupgt(PW*T&)t~TfTn)nbW
z;ziszx5M#0^87-l4e^$sn3p;abCZ)eKh3<5eOcJrv0|`e?Q%S~@<!>v{?WzFv4`l`
zX~zfR+PQLZjIGK`?*`StO+Dm|4Ln=$^Ow={f%n~R>SWz)gKa6_YM)U@TW<5Zh|!6<
zsh<8LaUnj$iFk2N7x+!W+|GFxq^IRetW7jSA9jRm$Bb*-s}Qu0$j0Q~-+d_~9;spa
zgjdQq{u5;n#MRBAf{q<4UIpJQVfgA<uQGCn>hjiKYav$OBK_~Ki!s@)*k9Ga6u#zr
z{EXM|T7HLIvyNAjuMTg^@Ea{3<ux)xKI%YSY~AeF#DRDa7vjUdo@+Vr?$bUUjR0$t
z6;e~bTg$k{eME`G0^+oD-3l4~cwKoF@n3P(V~jm07rwqD$UZXmUNpaUyDE!)?11(u
zGiA5A_P<u2CmzHF_?R_Z<arfNM~>5z8G94X#r~8r9LvzwxmS_>UA(yh#q99@-7>G=
zi<m<!Ew7X=D(y;N6=M&|fz3~Lz1F(@N6KMjflQQ*GE!ERJLpJ#sW<f}4#b1|cDQ%r
zKQ))19(URKIr7;$$ZgiJpX1n;`_&l(!{!bB817uZQl`H20PZ_3=GlVs;MhgDZTR_1
z?A+nlZbLbLy?QYt3uW@l=|87_)RX#BZ|ct+4|uG>xV}zyVtg9Zl?U?~?J&MMq<sR%
zyBV<q;(OqyG+BgwU?UsXmTos*E$vD<vBA$(md{JU22eNKU|VdHZTmS6I#=GQpT>HQ
z>!AN3cb{&y?$taExc5Xvj#~t=Z`$hBYfkZgHR3~@4jed;P`}{Ed(URfk53thXNWeH
zQCI`)Q@^xyu84fBB<!LjIgC^IISQ}kclce_!Mc`C9w@Ba-(I|P#(C<Yyi-5uY3|8`
z-qSFyE8+q1U;YC3s8)g<Oa(qC84oxPVotno-##;knBI6H9uLlECr!W1y)<dx%#-iu
zPLkzQhnT|Ge2<?weRu4>#`NoV=I|&d=k6#s<)<Fh$L0Mb^qh+PuF`)w-J$9OpE9t6
zafpv6*grBq;(Q37Nkv~`&YX2yh@Edul;5E1C=cbLe3X;&Qf|u6I1hbJK(BG&JyZAL
zhJy76{s6gfam;xSTDfx7UgpR2A?8ecJ|Qt?{>*2ZGRB_3-pn9ga_T*{$9CC1<)A#2
zi}F!U$_u$UXTKME3__gG(6bl*z_eyYwY-=EZHPIM6pW9LaSfChb6tebvt^9sTmpIE
zygB`l`Brw>1nXgate5q(9k$1I**@i<Jd}&$cgT4R@}{`YTFRRlh5z@RU<5EHRuI^>
z0LF9SUx(SJ;<@F*yox+9ccdSZ8~P;I&B+(X6y%Qn%D$Og`U~IZ=e&;B^LzY0>tTJY
zm-Vw9w#RnaKI9<hhauNo&e_4&<33+6ShN4Vn+XK+A&0Jov2$niuZzLMG4{2Lz3g}C
zlN&c~H2pB+GV?I<N1tW?>@R$upYu9i&;Fa=XFaTs^|F5QjrNYA-Nk6XGyJ?3WY3og
z`TzHoY(xO_C+A=+T@!g$GjP)zW9ymVX&u&4PH>Kev6=kQXF132FMOY$^EzJ7^%v%C
zsAnDOn~8dR^EXq_PEGiD)NdzbqZ<FKD*F-03m+|s*jx>{Sbda+@Y^OREm7LJr6t~P
z!q0GBeOzA+xjOe&{^9#?_a>=MxuWitT9}k{ruD`tlF~8qMjFraM$S9&JW>OHSP*|T
z^@9D*`FVQ2&^h;7a88qw+|NyGe6OSP#!>yeh;yE%=dJ_`_1vwnlb$;gdDXcUy3+BY
znyk>PJ}IdP&s}Nxxsf=Hube;A;6gofG3pdKHw{KkjYd}UMgXgMBY^+h62}N+iDLvx
zv+IXI{_}<Q=Rm}N-pT$P0^6q)*moW!J{0huM~M%G{O3{XK%w-`qtu1M{`0hG`SND;
zd|~wW&rI*UQ}p$@a{4^Fxj)`nPUGjVe_=F)>GGWxeSO}Hp8M_9f1aNG`#<;llmFcB
zkN$JNKgXPRvK2-=SZJRI#E&%l^MLphr7!|$ltKuwQ3}+IJ&#hLBjT~$9!{lG<P8&V
z7e>xa2apyyH}TpM$i#C?pdzf#5~wE6Ede_6Jkp?P&O*rTZ@dOgbC$+M%-16oc681?
ujoed(+^x>*fxQ0Gm9VB>??~iI!#9ltZtFZZDs<#4_itfze-54W+y4(7TmDG^

literal 0
HcmV?d00001

diff --git a/ServiceDashBored/ServiceDashBored.csproj b/ServiceDashBored/ServiceDashBored.csproj
index 18dfbd1..5384af4 100644
--- a/ServiceDashBored/ServiceDashBored.csproj
+++ b/ServiceDashBored/ServiceDashBored.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,23 +14,9 @@
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -40,7 +26,6 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -49,29 +34,12 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="BitFactory.Logging, Version=1.4.1.0, Culture=neutral, PublicKeyToken=de68848483a294a9, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>References\BitFactory.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Castle.Core, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.DynamicProxy2, Version=2.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\Castle.DynamicProxy2.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.MicroKernel, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\Castle.MicroKernel.dll</HintPath>
-    </Reference>
-    <Reference Include="Castle.Windsor, Version=1.0.3.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>References\Castle.Windsor.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
     <Reference Include="System.Data" />
@@ -108,11 +76,21 @@
     </Compile>
     <None Include="app.config" />
     <None Include="Resources\up.ico" />
-    <None Include="Resources\question.ico" />
+    <None Include="Resources\help.ico" />
     <None Include="Resources\remove.ico" />
     <None Include="Resources\accept.ico" />
     <None Include="Resources\warning.ico" />
     <None Include="Properties\DataSources\EndpointStatus.datasource" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <Compile Include="Settings.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Endpoint\Endpoint.csproj">
@@ -120,23 +98,6 @@
       <Name>Endpoint</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ServiceDashBored/Settings.cs b/ServiceDashBored/Settings.cs
new file mode 100644
index 0000000..3b8125c
--- /dev/null
+++ b/ServiceDashBored/Settings.cs
@@ -0,0 +1,28 @@
+namespace ServiceDashBored.Properties {
+    
+    
+    // This class allows you to handle specific events on the settings class:
+    //  The SettingChanging event is raised before a setting's value is changed.
+    //  The PropertyChanged event is raised after a setting's value is changed.
+    //  The SettingsLoaded event is raised after the setting values are loaded.
+    //  The SettingsSaving event is raised before the setting values are saved.
+    internal sealed partial class Settings {
+        
+        public Settings() {
+            // // To add event handlers for saving and changing settings, uncomment the lines below:
+            //
+            // this.SettingChanging += this.SettingChangingEventHandler;
+            //
+            // this.SettingsSaving += this.SettingsSavingEventHandler;
+            //
+        }
+        
+        private void SettingChangingEventHandler(object sender, System.Configuration.SettingChangingEventArgs e) {
+            // Add code to handle the SettingChangingEvent event here.
+        }
+        
+        private void SettingsSavingEventHandler(object sender, System.ComponentModel.CancelEventArgs e) {
+            // Add code to handle the SettingsSaving event here.
+        }
+    }
+}
diff --git a/ServiceDashBored/app.config b/ServiceDashBored/app.config
index 154153f..d326fd7 100644
--- a/ServiceDashBored/app.config
+++ b/ServiceDashBored/app.config
@@ -1,157 +1,31 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
     <configSections>
-     <section name="castle" type="Castle.Windsor.Configuration.AppDomain.CastleSectionHandler, Castle.Windsor" />
-  </configSections>
-  <castle>
-    <components>
-      <component id="form.component" type="ServiceDashBored.Main, ServiceDashBored">
-        <parameters>
-          <endpoints>
-            <array>
-              <item>${google.endpoint}</item>
-              <item>${10.21.63.6.endpoint}</item>
-							<item>${localhost.freespace.endpoint}</item>
-						</array>
-          </endpoints>
-        </parameters>
-      </component>
-
-			<component id="logger.component" service="BitFactory.Logging.Logger, BitFactory.Logging" type="BitFactory.Logging.FileLogger, BitFactory.Logging">
-				<parameters>
-					<aFileName>ServiceDashBored.log</aFileName>
-				</parameters>
-			</component>
-
-      <component id="kpcodl06.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-        <parameters>
-          <Name>kpcodl06:8080 (paypal)</Name>
-          <UriString>http://kpcodl06:8080/paypal_server/PayPalService</UriString>
-        </parameters>
-      </component>
-
-			<component id="kpapqlz03.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>kpapqlz03:8080 (paypal)</Name>
-					<UriString>http://kpapqlz03:8080/paypal_server/PayPalService</UriString>
-				</parameters>
-			</component>
-
-			<component id="kpcoql03.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>kpcoql03:8083 (OrderService)</Name>
-					<UriString>http://kpcoql03.jewelry.qa:8083/catalyst_server/OrderService</UriString>
-				</parameters>
-			</component>
-
-			<component id="10.21.63.6.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>10.21.63.6 (ws-virtual)</Name>
-					<UriString>http://10.21.63.6</UriString>
-				</parameters>
-			</component>
-
-			<component id="10.21.63.7.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>10.21.63.7 (ws-virtual)</Name>
-					<UriString>http://10.21.63.7</UriString>
-				</parameters>
-			</component>
-
-			<component id="10.21.63.8.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>10.21.63.8 (ws-virtual)</Name>
-					<UriString>http://10.21.63.8</UriString>
-				</parameters>
-			</component>
-
-			<component id="10.21.63.10.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>10.21.63.10 (ws-virtual)</Name>
-					<UriString>http://10.21.63.10</UriString>
-				</parameters>
-			</component>
-
-			<component id="10.21.63.11.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>10.21.63.11 (ws-physical)</Name>
-					<UriString>http://10.21.63.11</UriString>
-				</parameters>
-			</component>
-
-			<component id="10.21.63.12.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>10.21.63.12 (ws-physical)</Name>
-					<UriString>http://10.21.63.12</UriString>
-				</parameters>
-			</component>
-
-			<component id="images.jewelry.dmz.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-				<parameters>
-					<Name>images.jewelry.dmz (ws-virtual)</Name>
-					<UriString>http://images.jewelry.dmz</UriString>
-				</parameters>
-			</component>
-
-			<component id="google.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.HttpEndpoint, Endpoint">
-        <parameters>
-          <Name>Google</Name>
-          <UriString>http://www.google.com</UriString>
-        </parameters>
-      </component>
-
-			<component id="localhost.freespace.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.WmiEndpoint, Endpoint">
-				<parameters>
-					<Name>localhost D: Freespace</Name>
-					<MachineName>\\localhost</MachineName>
-					<ObjectQueryString>select FreeSpace from Win32_LogicalDisk where DeviceID='D:'</ObjectQueryString>
-					<ResultPropertyName>FreeSpace</ResultPropertyName>
-					<MinimumThreshold>50e6</MinimumThreshold>
-				</parameters>
-			</component>
-
-      <component id="kpapdl26.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.SoapEndpoint, Endpoint">
-        <parameters>
-          <Name>kpapdl26:8080 (payment)</Name>
-          <UriString>http://kpapdl26:8080/core_server/paymentservice</UriString>
-          <XpathQuery>//jtv:provider/text()</XpathQuery>
-					<XpathNamespaces>jtv,http://jtv.com</XpathNamespaces>
-          <ExpectedXpathResult>NoDecision</ExpectedXpathResult>
-					<SoapAction>"urn:getPaymentKey"</SoapAction>
-					<SoapRequest>
-						<![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jtv="http://jtv.com"><soapenv:Header/><soapenv:Body><jtv:getPaymentKey><jtv:context></jtv:context></jtv:getPaymentKey></soapenv:Body></soapenv:Envelope>]]>
-					</SoapRequest>
-        </parameters>
-      </component>
-
-			<component id="pscoql03.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.SoapEndpoint, Endpoint">
-			<parameters>
-				<Name>pscoql03:8080 (payment)</Name>
-				<UriString>http://pscoql03:8080/core_server/paymentservice</UriString>
-				<XpathQuery>//jtv:provider/text()</XpathQuery>
-				<XpathNamespaces>jtv,http://jtv.com</XpathNamespaces>
-				<ExpectedXpathResult>NoDecision</ExpectedXpathResult>
-				<SoapAction>"urn:getPaymentKey"</SoapAction>
-				<SoapRequest>
-					<![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jtv="http://jtv.com"><soapenv:Header/><soapenv:Body><jtv:getPaymentKey><jtv:context></jtv:context></jtv:getPaymentKey></soapenv:Body></soapenv:Envelope>]]>
-				</SoapRequest>
-			</parameters>
-		</component>
-
-		<component id="10.20.7.26.endpoint" service="Endpoint.IEndpoint, Endpoint" type="Endpoint.SoapEndpoint, Endpoint">
-			<parameters>
-				<Name>10.20.7.26:8080 (payment)</Name>
-				<UriString>http://10.20.7.26:8080/core_server/paymentservice</UriString>
-				<XpathQuery>//jtv:provider/text()</XpathQuery>
-				<XpathNamespaces>jtv,http://jtv.com</XpathNamespaces>
-				<ExpectedXpathResult>NoDecision</ExpectedXpathResult>
-				<SoapAction>"urn:getPaymentKey"</SoapAction>
-				<SoapRequest>
-					<![CDATA[<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:jtv="http://jtv.com"><soapenv:Header/><soapenv:Body><jtv:getPaymentKey><jtv:context></jtv:context></jtv:getPaymentKey></soapenv:Body></soapenv:Envelope>]]>
-				</SoapRequest>
-			</parameters>
-		</component>
-
-		</components>
-	</castle>
+      <section name="httpEndpointSection" type="Endpoint.HttpEndpointConfigurationSection, Endpoint"/>
+      <section name="htmlEndpointSection" type="Endpoint.HtmlEndpointConfigurationSection, Endpoint"/>
+			<section name="oracleEndpointSection" type="Endpoint.OracleEndpointConfigurationSection, Endpoint"/>
+      <section name="soapEndpointSection" type="Endpoint.SoapEndpointConfigurationSection, Endpoint"/>
+    </configSections>
+  <httpEndpointSection>
+    <endpoints>
+			<add name="kpcoql06 (paypal)" uri="http://kpcodl06:8080/paypal_server/PayPalService" />
+      <add name="google2" uri="http://www.google.com" />
+    </endpoints>
+  </httpEndpointSection>
+  <htmlEndpointSection>
+    <endpoints>
+			<!--<add name="kpapdl26 (payment)" uri="http://kpapdl26:8080/core_server/paymentservice" xpathQuery="//td[text()=&quot;PaymentService&quot;]/following-sibling::td/text()" expectedXpathResult="ACTIVE" />-->
+    </endpoints>
+  </htmlEndpointSection>
+	<oracleEndpointSection>
+		<endpoints>
+			<!--<add name="x5_int" connectionString="Data Source=x5_int01.jewelry.dev;User ID=webcontent;Password=acnwebcontent;" 
+					 scalarQueryString="select 1 from dual" expectedQueryResult="1" />-->
+		</endpoints>
+	</oracleEndpointSection>
+  <soapEndpointSection>
+    <endpoints>
+      <add name="kpapdl26 (key)" uri="http://kpapdl26:8080/core_server/paymentservice" xpathQuery="//jtv:provider/text()" xpathNamespaces="jtv,http://jtv.com" expectedXpathResult="NoDecision" soapAction="&quot;urn:getPaymentKey&quot;" soapRequest="&lt;soapenv:Envelope xmlns:soapenv=&quot;http://schemas.xmlsoap.org/soap/envelope/&quot; xmlns:jtv=&quot;http://jtv.com&quot;&gt;&lt;soapenv:Header/&gt;&lt;soapenv:Body&gt;&lt;jtv:getPaymentKey&gt;&lt;jtv:context&gt;&lt;/jtv:context&gt;&lt;/jtv:getPaymentKey&gt;&lt;/soapenv:Body&gt;&lt;/soapenv:Envelope&gt;" />
+    </endpoints>
+  </soapEndpointSection>
 </configuration>
\ No newline at end of file