diff --git a/.gitignore b/.gitignore
index fd3093b..6431763 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.ncrunchsolution
+gitversion.json
+
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -244,4 +247,3 @@ ModelManifest.xml
 
 # FAKE - F# Make
 .fake/
-*.ncrunchsolution
diff --git a/ASCOM.K8056.Switch.Specifications/ASCOM.K8056.Switch.Specifications.DotSettings b/ASCOM.K8056.Switch.Specifications/ASCOM.K8056.Switch.Specifications.DotSettings
deleted file mode 100644
index e7d45a2..0000000
--- a/ASCOM.K8056.Switch.Specifications/ASCOM.K8056.Switch.Specifications.DotSettings
+++ /dev/null
@@ -1 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" />
\ No newline at end of file
diff --git a/ReadMe.md b/ReadMe.md
index 72f2101..d078f4c 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -1,106 +1,96 @@
-Arduino Power Controller with ASCOM Switch Driver
-=================================================
+# Arduino Power Controller with ASCOM Switch Driver
 
 ![Arduino Power Controller][image]
 
-This driver and its source code and the accompanying Arduino Sketch are licensed under the [Tigra MIT license][license]. Essentially, anyone can do anything at all with this software, including commercially, without restriction. Anything you do is your responsibility and not mine.
+This driver and its source code and the accompanying Arduino Sketch are licensed under the [Tigra MIT license][license]. Essentially, anyone can do anything at all with this software, including commercially, without restriction. Anything you do is your responsibility and not the author's.
 
-For further information, please visit the [Project Home Page][project] or the [BitBucket Source Repository][source].
+If you find my work useful, please consider [sponsoring me][sponsor].
 
-Project Description
--------------------
+For further information, please visit the [Project Home Page][project] or the [Git Source Repository][source].
 
-This project is designed to enable easy control of power to astronomical instruments and ancillary
-equipment in a robotic observatory. The module can be controlled via the ASCOM Switch interface
-from any planetarium or observatory automation software that supports it. Alternatively, the driver
-can be used directly from a PowerShell script or any Windows scripting engine that can load a COM object.  
+## Project Description
 
-We have tested the unit while switching 12 volt power supplies. The limitations on voltage and
-current will depend on the relay module used. Commonly available modules have relays rated for
-up to 10 Amps and up to 250 volts AC. However, switching mains voltages and/or high current loads
-can be hazardous. A simple mistake can result in destruction of equipment, fire, electrocution 
-and death. ***Therefore we cannot endorse the use of this technology for switching high voltage or high
-current loads***. We suggest using the module only to switch low voltage DC power where the consequences
-of a mistake are more manageable.
+This project serves a dual purpose. It is a fully functional turnkey solution designed to enable easy control of power to astronomical instruments and ancillary equipment in an observatory. At the same time, it can form a learning platform and a jumping-off point for other new drivers. The Switch code can be gradually replaced with new code and if done with care, it is possible to keep a working build at all times. In the past, driver development began with a mostly empty template project which didn't offer much guidance on how to get things done or demonstrate good architectural choices. The author discovered, after developing over a dozen ASCOM drivers, that it was actually easier to start from an already fully functional project and add new code from there.
 
-The project uses cheap, commonly available modules to create a computer controlled power switch.
-We used an Arduino UNO R3, available for as little as £5, and an 8-port relay module obtained
-from eBay, also costing around £5. The only other item required is a 10-way Dupont style Male-to-Female
-jumper cable to connect up the relay module. A 5 volt Arduino UNO should be capable of driving
-the relays directly from the USB power.
+To begin work on your own driver, we recommend forking this project on GitHub, building it on your own system and then striking out towards your new driver.
 
-Note that the Arduino is not capable of powering your equipment directly and it should never be
-directly connected to the power supply being switched. The output side of the relays must remain completely isolated from the Arduino and the USB connection. The observatory equipment itself should be powered using a separate power supply designed for the purpose.
+The project consists of a an ASCOM Switch driver, plus an Arduino sketch. The two parts of the project communicate via the USB interface, which acts as a virtual COM port. The module can be controlled via the ASCOM Switch interface from any planetarium or observatory automation software that supports the ASCOM `ISwitch` interface. Alternatively, the driver can be used directly from a PowerShell script or any Windows scripting engine that can load a COM object.
 
-Software Architecture
----------------------
+This serves as a base implementation that can be extended to build other drivers and to understand the operation of out-of-process (COM LocalServer) drivers.
 
-For developers, this project demonstrates some advanced techniques for developing ASCOM drivers. At Tigra Astronomy, we use techniques that differ significantly from the methods described in the ASCOM documentation. We have our own reasons for this and this is not to say that our techniques are better or more correct, but they do demonstrate some alternative practices.
+### Cautions and Limitations
+
+We have tested the unit while switching 12 volt power supplies. The limitations on voltage and current will depend on the relay module used. Commonly available modules have relays rated for up to 10 Amps and up to 250 volts AC. However, switching mains voltages and/or high current loads can be hazardous. A simple mistake can result in destruction of equipment, fire, electrocution and death. **_Therefore we cannot endorse the use of this technology for switching high voltage or high current loads_**. We suggest using the module only to switch low voltage (less than 25 volts) and low current (less than 1 Amp) DC power where the consequences of a mistake are more manageable. If higher voltages and currents need to be switched, then the use of contactors and/or solid state relays (SSRs) should be investigated. The author has used this technique quite successfully to control 12v accessories for over 2 years at the time of writing.
+
+The project uses cheap, commonly available modules to create a computer controlled power switch. We used an Arduino UNO R3, available for as little as £5, and an 8-port relay module obtained from eBay, also costing around £5. The only other item required is a 10-way Dupont style Male-to-Female jumper cable to connect up the relay module. A 5 volt Arduino UNO should be capable of driving the relays directly from the USB power, but a 3.3 volt board would probably need additional level shifting buffers.
+
+Note that the Arduino is not capable of powering your equipment directly and it should never be directly connected to the power supply being switched. The output side of the relays must remain completely isolated from the Arduino and the USB connection. The observatory equipment itself should be powered using a separate power supply designed for the purpose.
+
+You must accept personal responsibility if you choose to use this project. This is a non-negotiable condition of the license agreement and the author(s) cannot be held liable for anything that happens as a result of you using the project.
+
+## Software Architecture
+
+For developers, this project demonstrates some practices for developing ASCOM out-of-process (COM LocalServer) drivers and can be used as a template project to create new drivers. The driver has been developed using modern object-oriented techniques. While this may take a little effort to understand initially, the techniques used can be very powerful and save you a lot of time in the long run, so it is worth persevering. You can always post questions to the [ASCOM-Talk Developers Group][ascom-dev] if you are stuck on any of the implementation details. People there are only too willing to help.
 
 In particular:
 
-- **Reactive ASCOM** - the project demonstrates our Reactive Communications library in use in a real driver.
-- **WiX Installer** - demonstrates how to perform a declarative no-code install of an ASCOM LocalServer driver, without running any of the code being installed during the installation. Normally, registration must be performed by running the LocalServer application with the /register option. Our install does this declaratively by directly creating the required registry keys. Our installers use WiX - Windows Installer XML, which is free and open source (it was actually Microsoft's very first open source product). The pros and cons of our technique vs. the ASCOM standard technique are complex and this is not the place to have that discussion, but we've used our techniques successfully in at least 6 production drivers.
-- **Aspect Oriented Programming** We use a product called PostSharp, which is an Aspect Oriented Programming framework and tool chain. PostSharp is not free but it will work in unlicensed mode for a project with a small number of properties and methods, and most ASCOM drivers fit that description nicely. PostSharp allows us to factor out a lot of 'boilerplate' code and replace it with attributes. Some of the attributes you'll notice in this project are:
-	- `[MustBeConnected]` used in the ASCOM Switch driver on methods that require that the comms channel is active. This is done in such a way that the check is only performed once in the case of nested calls.
-	- `[NLogTraceWithArguments]` emits diagnostics output on entry and exit from driver methods, including information about passed parameter values and return values, all without writing any code.
-	- `[NotifyPropertyChanged]` used in the device layer to implement the `INotifyPropertyChanged` interface automatically. 
-	- `[ReaderWriterSynchronized]` used in the `ClientConnectionManager` class within the LocalServer project to create a thread safe Reader/Writer lock around the list of connected clients. 
-	- 
-- **Modified LocalServer** Our LocalServer implementation has a few interesting customizations.
-	- **Reduced Attack Surface Area** that uses the Reflection-only load context when searching for assemblies with ASCOM drivers. The original LocalServer loads every assembly it finds into the execution context whilst running with elevated permissions. That comes with a high risk since malicious code could very easily be dropped into the folder. We minimize this attack vector by examining all assemblies in the Reflection-only context, so that no malicious code could execute while the server has elevated permissions.At other times we only load the assemblies containing ASCOM drivers. Note: there is no known incident of a LocalServer being used as an attack vector, but once we had identified the possibility we felt that we had to address it.
-	- **Status Display GUI** that shows the status of each client connection and also updates annunciators to show the state of the hardware. This also provides easy access to the Setup Dialog.
+- **Reactive ASCOM** - the project demonstrates a transactional thread-safe approach to handling device communications, using the [Reactive Communications for ASCOM][rx-ascom] library. Command/Response sequencing and thread safety can be a real challenge to get right and there are many subtle pitfalls to be avoided. Using a transactional approach helps to ensure correct sequencing of commands and responses, while the Reactive Extensions for .NET ensure thread safety and provide an event-driven programming model. ASCOM drivers are essentially real-time systems and this model is a good fit for that. For information and learning resources on the [Reactive Communications for ASCOM][rx-ascom] library, please visit the [project home page][rx-ascom].
+- **WiX Installer** - demonstrates how to perform a declarative no-code install of an ASCOM LocalServer driver, without running any of the code being installed during the installation. Normally, registration must be performed by running the LocalServer application with the `/register` option. Our install does this declaratively by directly creating the required registry keys. Our installers use WiX - Windows Installer XML, which is free and open source (it was actually Microsoft's very first open source project, written by people on the Windows Installer team).
+- **Aspect Oriented Programming** We use a product called PostSharp, which is an Aspect Oriented Programming framework and tool chain. PostSharp Essentials is free for a project with a relatively small number of classes, and most ASCOM drivers fit that description nicely. PostSharp allows us to factor out a lot of 'boilerplate' code and replace it with attributes. Some of the attributes you'll notice in this project are:
 
+  - `[MustBeConnected]` used in the ASCOM Switch driver on methods that require that the comms channel is active. This is done in such a way that the check is only performed once in the case of nested calls.
+  - `[NLogTraceWithArguments]` emits diagnostics output on entry and exit from driver methods, including information about passed parameter values and return values, all without writing any code.
+  - `[NotifyPropertyChanged]` used in the device layer to implement the `INotifyPropertyChanged` interface automatically.
+  - `[ReaderWriterSynchronized]` used in the `ClientConnectionManager` class within the LocalServer project to create a thread safe Reader/Writer lock around the list of connected clients.
 
-Installation
-------------
+  The `Aspects` project contains a ReadMe file with more details.
 
-<a href="https://bitbucket.org/tigra-astronomy/ta.arduinopowercontroller-ascom-switch-driver/downloads/" class="btn btn-info" target="new">Download &raquo;</a>
+- **LocalServer with Integral Driver Classes** A recent development with the LocalServer pattern was to incorporate driver classes directly into the LocalServer project. Previously, drivers were implemented as separate projects and dynamically loaded by the LocalServer process. However, it was realized that this had a number of disadvantages and promoted poor design. Driver classes are now incorporated directly into the LocalServer project and _should contain the bare minimum code necessary to compile and load_.
 
-The installer can be downloaded from [BitBucket][download]. The installer has a minimal user interface but is fully functional. Upgrades can be installed 'on top of' existing versions and we expect that settings will be preserved in that situation.
+- **Status Display User Interface** that shows the status of each client connection and also updates annunciators to show the state of the hardware. This also provides easy access to the Setup Dialog. Thread safety is again ensured using the Reactive Extensions for .NET.
 
-The installer has two versions, one for 32-bit (x86) computers and another for 64-bit (x64) computers. The installer checks that it is running on the right type of system and will not allow installation to proceed if it finds a mismatch. This allows our ASCOM drivers to function correctly in all situations and they are compatible with operating systems and applications of all varieties.
+## Installation
 
-<span class="text-danger">End users should install the `Release` version of the driver. `Debug` versions are for diagnostic use and will have much worse performance than the release build.</span>
+<button>[Download »][download]</button>
 
-Driver Configuration
---------------------
+The installer can be downloaded from [GitHub][download]. The installer has a minimal user interface but is fully functional. Upgrades can be installed 'on top of' existing versions and we expect that settings will be preserved in that situation.
 
-The driver currently allows configuration only of the Comm Port Name (typically "COM1") via the Setup Dialog. Other parameters may be configurable but there is no user interface. They can be edited using the *ASCOM Profile Explorer* utility.
+The installer has two versions, one for 32-bit (x86) computers and another for 64-bit (x64) computers. The installer checks that it is running on the right type of system and will not allow installation to proceed if it finds a mismatch. This allows our ASCOM drivers to function correctly in all situations and they are compatible with operating systems and applications of all varieties.
+## Driver Configuration
 
-Diagnostics
------------
+The driver currently allows configuration only of the Comm Port Name (typically "COM1") via the Setup Dialog. Other parameters may be configurable but there is no user interface. They can be edited using the _ASCOM Profile Explorer_ utility.
 
-The driver emits diagnostic information using NLog. It is configured by default to emit informational messages to the Trace channel and errors & warnings to the log file. Live output can be viewed with a utility such as SysInternals' DebugView, or Binary Fortress' Log Fusion.
+## Diagnostics
 
-Alternatively, the NLog configuration file `NLog.dll.nlog` and `NLog.config` can be edited to emit logging information to any NLog target, including a file or database. See the [NLog wiki][nlog] for information on configuring NLog.
+The driver emits diagnostic information using NLog. It is configured by default to emit informational messages to the Trace channel and errors & warnings to the log file. Live output can be viewed with a utility such as SysInternals' DebugView, or Binary Fortress' Log Fusion.
 
-Feeback and Bugs
-----------------
+Alternatively, the NLog configuration file `NLog.config` can be edited to emit logging information to any NLog target, including a file or database. See the [NLog wiki][nlog] for information on configuring NLog. Note that NLog supports _Semantic Logging_, to services such as Seq and SeriLog, and this capability is well worth exploring.
+## Feeback and Bugs
 
-There is a bug tracker at the [BitBucket source repository][source]. Please submit any bug reports and feature requests there.
+There is a bug tracker at the [GitHub source repository][source]. Please submit any bug reports and feature requests there.
 
 It would be most helpful if you could quote the full version number of the driver when reporting any issues.
 
-Get Involved
-------------
+## Get Involved
 
-There are probably many ways in which this driver could be improved. If you would like to contribute, then we would be delighted to accept your pull request at our [BitBucket source repository][source]. Any source code that you contribute will be covered by the original [Tigra MIT License][license] and once merged, contributions are irrevocable.
+There are probably many ways in which this driver could be improved. If you would like to contribute, then we would be delighted to accept your pull request at our [GitHub repository][source]. Any source code that you contribute will be covered by the original [Tigra MIT License][license] and once merged, contributions are irrevocable.
 
 If you want to get involved but are not sure what to do, please check the [bug tracker][source] to see if there are any outstanding issues or feature requests that you could work on.
 
-Buy Me a Cup of Coffee
-----------------------
+## Sponsor My Work
 
-Software development is powered by coffee! If you've found this driver useful, or you're just feeling benevolent, then you might consider [buying me a cup of coffee][coffee] (or several cups) using the link at the bottom of my web site. Thank you!
+If you find my work useful, please consider [sponsoring me on GitHub][sponsor].
 
-August 2016, Tim Long <Tim@tigra-astronomy.com>
+March 2022, Tim Long <Tim@timtek.net>
 
-[license]: https://tigra.mit-license.org/		                   "Tigra Astronomy Open Source License"
-[project]: http://tigra-astronomy.com/oss/arduino-power-controller      "Project Home Page at Tigra Astronomy"
-[source]:  https://bitbucket.org/account/user/tigra-astronomy/projects/OPC  "BitBucket Git Source Control"
-[download]: https://bitbucket.org/tigra-astronomy/ta.arduinopowercontroller-ascom-switch-driver/downloads/ "Download the installer"
-[tigra]:   http://tigra-astronomy.com                              "Tigra Astronomy Web Site"
-[nlog]:    https://github.com/nlog/nlog/wiki/Configuration-file#targets "NLog Targets"
-[coffee]:  http://tigra-astronomy.com/#coffee                      "Buy me a cup of coffee"
-[image]:   http://tigra-astronomy.com/Media/TigraAstronomy/site-images/arduino-power-controller/hardware.png  "Arduino Power Controller"
\ No newline at end of file
+[coffee]: # "Buy me a cup of coffee"
+[download]: https://github.com/Tigra-Astronomy/TA.ArduinoPowerController.AscomServer/releases/latest "Download the installer"
+[image]: images/hardware.png "Arduino Power Controller"
+[license]: https://tigra.mit-license.org/ "Tigra Astronomy Open Source License"
+[nlog]: https://github.com/nlog/nlog/wiki/Configuration-file#targets "NLog Targets"
+[project]: https://github.com/Tigra-Astronomy/TA.ArduinoPowerController.AscomServer "Project Home Page"
+[source]: https://github.com/Tigra-Astronomy/TA.ArduinoPowerController.AscomServer "Git Source Repository"
+[tigra]: # "Tigra Astronomy Web Site"
+[ascom-dev]: https://ascomtalk.groups.io/g/Developer "ASCOM-Talk/Developer discussion group"
+[rx-ascom]: https://github.com/Tigra-Astronomy/TA.ReactiveCommunications "Project home page: Reactive Communications for ASCOM"
+[sponsor]: https://github.com/sponsors/NameOfTheDragon "sponsor me on GitHub"
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/ArduinoSwitchTransaction.cs b/TA.ArduinoPowerController.DeviceInterface/ArduinoSwitchTransaction.cs
deleted file mode 100644
index e8d724d..0000000
--- a/TA.ArduinoPowerController.DeviceInterface/ArduinoSwitchTransaction.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: ArduinoSwitchTransaction.cs  Last modified: 2017-03-16@23:33 by Tim Long
-
-using System;
-using PostSharp.Patterns.Contracts;
-using TA.Ascom.ReactiveCommunications.Transactions;
-
-namespace TA.ArduinoPowerController.DeviceInterface
-    {
-    internal abstract class ArduinoSwitchTransaction : TerminatedStringTransaction
-        {
-        protected ArduinoSwitchTransaction([Required] string command) : base(command)
-            {
-            Timeout = TimeSpan.FromSeconds(2);
-            }
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/CommunicationsStackBuilder.cs b/TA.ArduinoPowerController.DeviceInterface/CommunicationsStackBuilder.cs
deleted file mode 100644
index 9e95b9d..0000000
--- a/TA.ArduinoPowerController.DeviceInterface/CommunicationsStackBuilder.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: CommunicationsStackBuilder.cs  Last modified: 2017-03-16@23:33 by Tim Long
-
-using System;
-using TA.Ascom.ReactiveCommunications;
-
-namespace TA.ArduinoPowerController.DeviceInterface
-    {
-    /// <summary>
-    ///     Factory methods for creating various parts of the communications stack.
-    /// </summary>
-    public static class CommunicationsStackBuilder
-        {
-        public static ICommunicationChannel BuildChannel(DeviceEndpoint endpoint)
-            {
-            if (endpoint is SerialDeviceEndpoint)
-                return new SerialCommunicationChannel(endpoint);
-            throw new NotSupportedException($"There is no supported channel type for the endpoint: {endpoint}")
-                {
-                Data = {["endpoint"] = endpoint}
-                };
-            }
-
-        public static TransactionObserver BuildTransactionObserver(ICommunicationChannel channel)
-            {
-            return new TransactionObserver(channel);
-            }
-
-        public static ITransactionProcessor BuildTransactionProcessor(TransactionObserver observer)
-            {
-            var processor = new ReactiveTransactionProcessor();
-            processor.SubscribeTransactionObserver(observer);
-            return processor;
-            }
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/DeviceController.cs b/TA.ArduinoPowerController.DeviceInterface/DeviceController.cs
index a5edfe5..aeff3f3 100644
--- a/TA.ArduinoPowerController.DeviceInterface/DeviceController.cs
+++ b/TA.ArduinoPowerController.DeviceInterface/DeviceController.cs
@@ -1,63 +1,64 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: DeviceController.cs  Last modified: 2017-03-16@23:33 by Tim Long
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: DeviceController.cs  Last modified: 2019-09-08@08:36 by Tim Long
 
 using System;
-using NLog;
 using TA.Ascom.ReactiveCommunications;
+using TA.Utils.Core.Diagnostics;
 
 namespace TA.ArduinoPowerController.DeviceInterface
-    {
+{
     public class DeviceController : IDisposable
-        {
+    {
         private readonly ITransactionProcessorFactory factory;
-        private readonly Logger log = LogManager.GetCurrentClassLogger();
+        private readonly ILog log;
 
         private bool disposed;
         private ITransactionProcessor transactionProcessor;
 
-        public DeviceController(ITransactionProcessorFactory factory)
-            {
+        public DeviceController(ITransactionProcessorFactory factory, ILog logService)
+        {
             this.factory = factory;
-            }
+            log = logService;
+        }
 
         public bool IsOnline => transactionProcessor != null && (factory?.Channel?.IsOpen ?? false);
 
         public void Dispose()
-            {
+        {
             Dispose(true);
             GC.SuppressFinalize(this);
-            }
+        }
 
         public void ClearRelay(ushort id)
-            {
+        {
             var transaction = new WriteRelayTransaction(id, false);
             transactionProcessor.CommitTransaction(transaction);
             transaction.WaitForCompletionOrTimeout();
             RaiseRelayStateChanged(id, false);
-            }
+        }
 
         /// <summary>
         ///     Close the connection to the AWR system. This should never fail.
         /// </summary>
         public void Close()
-            {
+        {
             log.Warn("Close requested");
             if (!IsOnline)
-                {
+            {
                 log.Warn("Ignoring Close request because already closed");
                 return;
-                }
+            }
             log.Info($"Closing device endpoint: {factory.Endpoint}");
             factory.DestroyTransactionProcessor();
             log.Info("====== Channel closed: the device is now disconnected ======");
-            }
+        }
 
         protected virtual void Dispose(bool fromUserCode)
-            {
+        {
             if (!disposed)
                 if (fromUserCode)
                     Close();
@@ -65,51 +66,50 @@ protected virtual void Dispose(bool fromUserCode)
 
             // ToDo: Call the base class's Dispose(Boolean) method, if available.
             // base.Dispose(fromUserCode);
-            }
+        }
 
         // The IDisposable pattern, as described at
         // http://www.codeproject.com/Articles/15360/Implementing-IDisposable-and-the-Dispose-Pattern-P
 
-
         /// <summary>
         ///     Finalizes this instance (called prior to garbage collection by the CLR)
         /// </summary>
         ~DeviceController()
-            {
+        {
             Dispose(false);
-            }
+        }
 
         /// <summary>
         ///     Opens the transaction pipeline for sending and receiving and performs initial state synchronization with the drive
         ///     system.
         /// </summary>
         public void Open()
-            {
+        {
             log.Info($"Opening device endpoint: {factory.Endpoint}");
             transactionProcessor = factory.CreateTransactionProcessor();
             log.Info("====== Initialization completed successfully : Device is now ready to accept commands ======");
-            }
-
+        }
 
         public void PerformOnConnectTasks()
-            {
+        {
             //ToDo: perform any tasks that must occur as soon as the communication channel is connected.
-            }
+        }
 
         protected void RaiseRelayStateChanged(int relay, bool newState)
-            {
+        {
             var args = new RelayStateChangedEventArgs(relay, newState);
             RelayStateChanged?.Invoke(this, args);
-            }
+        }
 
         public event EventHandler<RelayStateChangedEventArgs> RelayStateChanged;
 
         public void SetRelay(ushort id)
-            {
+        {
             var transaction = new WriteRelayTransaction(id, true);
             transactionProcessor.CommitTransaction(transaction);
             transaction.WaitForCompletionOrTimeout();
-            RaiseRelayStateChanged(id, true);
-            }
+            if (transaction.Successful)
+                RaiseRelayStateChanged(id, true);
         }
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/Properties/AssemblyInfo.cs b/TA.ArduinoPowerController.DeviceInterface/Properties/AssemblyInfo.cs
index 6b98fb8..909187b 100644
--- a/TA.ArduinoPowerController.DeviceInterface/Properties/AssemblyInfo.cs
+++ b/TA.ArduinoPowerController.DeviceInterface/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@
 using System.Reflection;
 
 [assembly: AssemblyTitle("TA.ArduinoPowerController.DeviceInterface")]
-[assembly: AssemblyDescription("Low level device communications layer")]
\ No newline at end of file
+[assembly: AssemblyDescription("Low level device communications layer for Arduino Power Controller")]
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/ReactiveTransactionProcessorFactory.cs b/TA.ArduinoPowerController.DeviceInterface/ReactiveTransactionProcessorFactory.cs
index 670f325..b1a2a06 100644
--- a/TA.ArduinoPowerController.DeviceInterface/ReactiveTransactionProcessorFactory.cs
+++ b/TA.ArduinoPowerController.DeviceInterface/ReactiveTransactionProcessorFactory.cs
@@ -1,29 +1,33 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: ReactiveTransactionProcessorFactory.cs  Last modified: 2017-03-16@23:33 by Tim Long
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: ReactiveTransactionProcessorFactory.cs  Last modified: 2019-09-08@06:37 by Tim Long
 
 using System;
-using System.Threading;
+using System.Threading.Tasks;
 using TA.Ascom.ReactiveCommunications;
 
 namespace TA.ArduinoPowerController.DeviceInterface
-    {
+{
+    /// <summary>
+    ///     Class ReactiveTransactionProcessorFactory. Used to set up and tear down the communications stack
+    ///     as the device is connected and disconnected.
+    ///     Implements <see cref="TA.ArduinoPowerController.DeviceInterface.ITransactionProcessorFactory" />
+    /// </summary>
+    /// <seealso cref="TA.ArduinoPowerController.DeviceInterface.ITransactionProcessorFactory" />
     public class ReactiveTransactionProcessorFactory : ITransactionProcessorFactory
-        {
-        public string ConnectionString { get; }
-
+    {
         private TransactionObserver observer;
         private ReactiveTransactionProcessor processor;
 
         public ReactiveTransactionProcessorFactory(string connectionString)
-            {
-            this.ConnectionString = connectionString;
-            // Endpoint will be InvalidEndpoint if the connection string is invalid.
-            Endpoint = DeviceEndpoint.FromConnectionString(connectionString);
-            }
+        {
+            ConnectionString = connectionString;
+        }
+
+        public string ConnectionString { get; }
 
         public ICommunicationChannel Channel { get; private set; }
 
@@ -33,17 +37,16 @@ public ReactiveTransactionProcessorFactory(string connectionString)
         /// </summary>
         /// <returns>ITransactionProcessor.</returns>
         public ITransactionProcessor CreateTransactionProcessor()
-            {
-            Endpoint = DeviceEndpoint.FromConnectionString(ConnectionString);
-            Channel = CommunicationsStackBuilder.BuildChannel(Endpoint);
+        {
+            Channel = new ChannelFactory().FromConnectionString(ConnectionString);
             observer = new TransactionObserver(Channel);
             processor = new ReactiveTransactionProcessor();
             processor.SubscribeTransactionObserver(observer, TimeSpan.FromMilliseconds(100));
             Channel.Open();
-            //Task.Delay(TimeSpan.FromSeconds(2)).Wait(); // Arduino needs 2 seconds to initialize
-            Thread.Sleep(TimeSpan.FromSeconds(3));
+            // Arduino may need a few seconds to initialize after starting the connection
+            Task.Delay(TimeSpan.FromSeconds(5)).Wait();
             return processor;
-            }
+        }
 
         /// <summary>
         ///     Destroys the transaction processor and its dependencies. Ensures that the
@@ -53,7 +56,7 @@ public ITransactionProcessor CreateTransactionProcessor()
         ///     <see cref="CreateTransactionProcessor" /> again.
         /// </summary>
         public void DestroyTransactionProcessor()
-            {
+        {
             processor?.Dispose();
             processor = null; // [Sentinel]
             observer = null;
@@ -62,8 +65,8 @@ public void DestroyTransactionProcessor()
             Channel?.Dispose();
             Channel = null; // [Sentinel]
             GC.Collect(3, GCCollectionMode.Forced, blocking: true);
-            }
-
-        public DeviceEndpoint Endpoint { get; set; }
         }
-    }
\ No newline at end of file
+
+        public DeviceEndpoint Endpoint => Channel?.Endpoint ?? new InvalidEndpoint();
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/ReadMe.md b/TA.ArduinoPowerController.DeviceInterface/ReadMe.md
new file mode 100644
index 0000000..e9e390c
--- /dev/null
+++ b/TA.ArduinoPowerController.DeviceInterface/ReadMe.md
@@ -0,0 +1,5 @@
+# Device Interface project
+
+It is best practice to place the device communications and interfacing code in its own separate project. One reason for doing so is so that this "business logic" code can be unit tested in isolation.
+
+This will become particularly important in projects that contain more than one driver class. The driver classes can then share the common device interface code.
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/RelayCommand.cs b/TA.ArduinoPowerController.DeviceInterface/RelayCommand.cs
new file mode 100644
index 0000000..dcd4066
--- /dev/null
+++ b/TA.ArduinoPowerController.DeviceInterface/RelayCommand.cs
@@ -0,0 +1,26 @@
+// This file is part of the TA.ArduinoPowerController project
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: RelayCommand.cs  Last modified: 2019-09-08@12:35 by Tim Long
+namespace TA.ArduinoPowerController.DeviceInterface
+{
+    /// <summary>
+    /// A simple data transfer object (DTO) for storing relay operations
+    /// </summary>
+    class RelayCommand
+    {
+        public string Operation { get; set; }
+
+        public ushort Relay { get; set; }
+
+        public bool State { get; set; }
+
+        /// Debugging is always easier if there is a ToString method.
+        public override string ToString()
+        {
+            return $"{nameof(Operation)}: {Operation}, {nameof(Relay)}: {Relay}, {nameof(State)}: {State}";
+        }
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/TA.ArduinoPowerController.DeviceInterface.csproj b/TA.ArduinoPowerController.DeviceInterface/TA.ArduinoPowerController.DeviceInterface.csproj
index a844599..c6a8ef1 100644
--- a/TA.ArduinoPowerController.DeviceInterface/TA.ArduinoPowerController.DeviceInterface.csproj
+++ b/TA.ArduinoPowerController.DeviceInterface/TA.ArduinoPowerController.DeviceInterface.csproj
@@ -9,17 +9,17 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TA.ArduinoPowerController.DeviceInterface</RootNamespace>
     <AssemblyName>TA.ArduinoPowerController.DeviceInterface</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <DontImportPostSharp>True</DontImportPostSharp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\BuildOutput\</OutputPath>
+    <OutputPath>..\BuildOutput\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,75 +28,74 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\BuildOutput\</OutputPath>
+    <OutputPath>..\BuildOutput\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.5\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp, Version=4.3.31.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.4.3.31\lib\net35-client\PostSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Common, Version=4.3.31.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Common.4.3.31\lib\net45\PostSharp.Patterns.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Model, Version=4.3.31.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Model.4.3.31\lib\net40\PostSharp.Patterns.Model.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="TA.Ascom.ReactiveCommunications, Version=0.4.6306.31345, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\TA.Ascom.ReactiveCommunications.0.4.2\lib\net45\TA.Ascom.ReactiveCommunications.dll</HintPath>
-    </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="CommunicationsStackBuilder.cs" />
     <Compile Include="DeviceController.cs" />
     <Compile Include="ITransactionProcessorFactory.cs" />
-    <Compile Include="ArduinoSwitchTransaction.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ReactiveTransactionProcessorFactory.cs" />
+    <Compile Include="RelayCommand.cs" />
     <Compile Include="RelayStateChangedEventArgs.cs" />
-    <Compile Include="TransactionException.cs" />
     <Compile Include="WriteRelayTransaction.cs" />
   </ItemGroup>
   <ItemGroup>
+    <AdditionalFiles Include="..\TA.ArduinoPowerController.ArchitectureValidation\Dependency Validation.layerdiagram">
+      <Link>Dependency Validation.layerdiagram</Link>
+      <Visible>False</Visible>
+    </AdditionalFiles>
     <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="ReadMe.md" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GitVersion.MsBuild">
+      <Version>5.9.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="JetBrains.Annotations">
+      <Version>2021.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="PostSharp">
+      <Version>6.10.8</Version>
+    </PackageReference>
+    <PackageReference Include="PostSharp.Patterns.Model">
+      <Version>6.10.8</Version>
+    </PackageReference>
+    <PackageReference Include="TA.Ascom.ReactiveCommunications">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="TA.Utils.Core">
+      <Version>1.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="..\TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\PostSharp.4.3.31\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" />
-  <Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
-    <Error Condition="!Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://www.postsharp.net/links/nuget-restore." />
-    <Error Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
   </Target>
   <!-- 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/TA.ArduinoPowerController.DeviceInterface/TransactionException.cs b/TA.ArduinoPowerController.DeviceInterface/TransactionException.cs
deleted file mode 100644
index fc0f735..0000000
--- a/TA.ArduinoPowerController.DeviceInterface/TransactionException.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: TransactionException.cs  Last modified: 2017-03-16@23:33 by Tim Long
-
-using System;
-using TA.Ascom.ReactiveCommunications;
-
-namespace TA.ArduinoPowerController.DeviceInterface
-    {
-    [Serializable]
-    public sealed class TransactionException : Exception
-        {
-        //
-        // For guidelines regarding the creation of new exception types, see
-        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpgenref/html/cpconerrorraisinghandlingguidelines.asp
-        // and
-        //    http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncscol/html/csharp07192001.asp
-        //
-
-        public TransactionException() {}
-
-        public TransactionException(string message) : base(message) {}
-
-        public TransactionException(string message, Exception inner) : base(message, inner) {}
-
-        public DeviceTransaction Transaction { get; set; }
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/WriteRelayTransaction.cs b/TA.ArduinoPowerController.DeviceInterface/WriteRelayTransaction.cs
index c4c7d0c..c9a7d22 100644
--- a/TA.ArduinoPowerController.DeviceInterface/WriteRelayTransaction.cs
+++ b/TA.ArduinoPowerController.DeviceInterface/WriteRelayTransaction.cs
@@ -1,55 +1,104 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: WriteRelayTransaction.cs  Last modified: 2017-03-16@23:33 by Tim Long
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: WriteRelayTransaction.cs  Last modified: 2019-09-08@12:50 by Tim Long
+
+using System;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Text.RegularExpressions;
+using TA.Ascom.ReactiveCommunications;
+using TA.Ascom.ReactiveCommunications.Diagnostics;
 
 namespace TA.ArduinoPowerController.DeviceInterface
     {
-    internal class WriteRelayTransaction : ArduinoSwitchTransaction
-        {
+    /// <summary>
+    ///     Class WriteRelayTransaction. A transaction type used to write a relay setting.
+    ///     The transaction checks that the received response contains the expected relay number and value.
+    ///     No value is returned by this transaction (it is a write-only transaction) but the received
+    ///     response string may be found in <see cref="DeviceTransaction.Response" />.
+    /// </summary>
+    /// <seealso cref="ArduinoSwitchTransaction" />
+    /// <seealso cref="DeviceTransaction" />
+    internal class WriteRelayTransaction : DeviceTransaction
+    {
+        private const string ResponsePattern = @"^:(?<Operation>[SsRr])(?<Relay>\d)(?<Value>[01])#$";
+
+        private const RegexOptions ParseOptions = RegexOptions.Compiled | RegexOptions.CultureInvariant |
+                                                  RegexOptions.ExplicitCapture | RegexOptions.Singleline;
+
+        private static readonly Regex responseParser = new Regex(ResponsePattern, ParseOptions);
         private readonly ushort relay;
         private readonly bool value;
 
         public WriteRelayTransaction(ushort relay, bool value) : base(CreateWriteCommand(relay, value))
-            {
+        {
             this.relay = relay;
             this.value = value;
-            }
+            Timeout=TimeSpan.FromSeconds(2);
+        }
+
+        /// <summary>
+        ///     Upon successful transaction completion, contains the received relay operation.
+        /// </summary>
+        public RelayCommand Value { get; private set; }
 
         private static string CreateWriteCommand(ushort relay, bool value)
-            {
+        {
             var onOrOff = value ? '1' : '0';
             return $":S{relay}{onOrOff}#";
-            }
+        }
 
-        protected override void OnNext(string response)
+        /// <summary>
+        ///     Observes the character sequence from the communications channel until a satisfactory
+        ///     response has been received. Every transaction class must have an <c>ObserveResponse</c>
+        ///     override that picks out exactly one response that is valid for the type of transaction.
+        ///     This behaviour is a key design pillar of Reactive Communications for ASCOM.
+        /// </summary>
+        /// <param name="source">The source <see cref="IObservable{char}" /> sequence.</param>
+        /// <remarks>
+        ///     This method is contractually required to guarantee that only valid responses are accepted.
+        /// </remarks>
+        public override void ObserveResponse(IObservable<char> source)
+        {
+            // Filter the response stream into a sequence of valid responses using a regular expression match
+            var query = from message in source.DelimitedMessageStrings(':','#')
+                        where responseParser.IsMatch(message)
+                        select message;
+            // Then subscribe to the valid response sequence and only take the first element.
+            // Note that OnNext and OnError are provided by the DeviceTransaction base class,
+            // but OnCompleted is overridden here.
+            query.Trace("Relay")
+                .Take(1)
+                .Subscribe(OnNext, OnError, OnCompleted);
+        }
+
+        /// <summary>
+        ///     Called when the response sequence completes. This indicates a successful
+        ///     transaction and provides an opportunity for further analysis of a known-good response.
+        /// </summary>
+        /// <remarks>
+        ///     If this method is called, we know that a response has been received and that it is
+        ///     guaranteed to be valid, since the <see cref="ObserveResponse" /> method is
+        ///     constructed to only respond to valid responses. If we never receive a response, then
+        ///     the transaction will time out and <see cref="DeviceTransaction.OnError" /> would be
+        ///     called instead. Here we can perform further analysis on our response string and
+        ///     transform it into a more meaningful type.
+        /// </remarks>
+        protected override void OnCompleted()
+        {
+            if (Response.Any())
             {
-            // Expecting :Srv#
-            var relayNumber = int.Parse(response.Substring(2, 1));
-            var relayValue = response[3] == '1';
-            if (response[0] != 'S')
-                {
-                OnError(
-                    new TransactionException(
-                        $"Response appears to be of the wrong type. Expected 'S' but got '{response[0]}'"));
-                return;
-                }
-            if (relayNumber != relay)
-                {
-                OnError(new TransactionException(
-                    $"Response contained an unexpected relay number. Expected={relay}, Actual={relayNumber}"));
-                return;
-                }
-            if (relayValue != value)
-                {
-                OnError(
-                    new TransactionException(
-                        $"Response contained an unexpected relay value. Expected={value}, Actual={relayValue}"));
-                return;
-                }
-            base.OnNext(response);
+                var matches = responseParser.Match(Response.Single());
+                var operation = matches.Groups["Operation"].Value.ToUpperInvariant();
+                int relay = int.Parse(matches.Groups["Relay"].Value);
+                bool state = matches.Groups["Value"].Value == "1";
+                Value = new RelayCommand {Operation = operation, Relay = this.relay, State = state};
+                //Log.Debug().Message("Successfully received RelayCommand {response}", Value).Write();
             }
+            base.OnCompleted(); //  This is critical - it marks the transaction as complete.
         }
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.DeviceInterface/app.config b/TA.ArduinoPowerController.DeviceInterface/app.config
index 269c73d..66f86f0 100644
--- a/TA.ArduinoPowerController.DeviceInterface/app.config
+++ b/TA.ArduinoPowerController.DeviceInterface/app.config
@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.30.0" newVersion="4.3.30.0" />
+        <assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.2.11.0" newVersion="6.2.11.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.2.11.0" newVersion="6.2.11.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/TA.ArduinoPowerController.DeviceInterface/packages.config b/TA.ArduinoPowerController.DeviceInterface/packages.config
deleted file mode 100644
index e14383b..0000000
--- a/TA.ArduinoPowerController.DeviceInterface/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net462" />
-  <package id="NLog" version="4.4.5" targetFramework="net462" />
-  <package id="PostSharp" version="4.3.31" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Common" version="4.3.31" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Model" version="4.3.31" targetFramework="net462" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net462" />
-  <package id="TA.Ascom.ReactiveCommunications" version="0.4.2" targetFramework="net462" />
-</packages>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/Switch.cs b/TA.ArduinoPowerController.Server/AscomSwitch/Switch.cs
similarity index 84%
rename from TA.ArduinoPowerController.Switch/Switch.cs
rename to TA.ArduinoPowerController.Server/AscomSwitch/Switch.cs
index 759e932..dc18e81 100644
--- a/TA.ArduinoPowerController.Switch/Switch.cs
+++ b/TA.ArduinoPowerController.Server/AscomSwitch/Switch.cs
@@ -1,9 +1,9 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
 // Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: Switch.cs  Last modified: 2017-03-17@17:37 by Tim Long
+//
+// File: Switch.cs  Last modified: 2019-09-06@21:59 by Tim Long
 
 using System;
 using System.Collections;
@@ -15,18 +15,14 @@
 using JetBrains.Annotations;
 using NLog;
 using TA.ArduinoPowerController.DeviceInterface;
-using TA.ArduinoPowerController.Server;
 using TA.ArduinoPowerController.Server.Properties;
 using TA.PostSharp.Aspects;
-using NotImplementedException = System.NotImplementedException;
+using TA.Utils.Core;
+using NotImplementedException = ASCOM.NotImplementedException;
 
-#if DEBUG_IN_EXTERNAL_APP
-using System.Windows.Forms;
 
-#endif
-
-namespace TA.ArduinoPowerController.AscomSwitch
-    {
+namespace TA.ArduinoPowerController.Server.AscomSwitch
+{
     [ProgId(SharedResources.SwitchDriverId)]
     [Guid("7e30c5fc-bfdc-48a7-b3d3-965e0ad100a2")]
     [ComVisible(true)]
@@ -35,7 +31,7 @@ namespace TA.ArduinoPowerController.AscomSwitch
     [ServedClassName(SharedResources.SwitchDriverName)]
     [NLogTraceWithArguments]
     public class Switch : ReferenceCountedObjectBase, ISwitchV2, IDisposable, IAscomDriver
-        {
+    {
         private readonly Guid clientId;
         private readonly ILogger log = LogManager.GetCurrentClassLogger();
         private DeviceController device;
@@ -47,39 +43,34 @@ public class Switch : ReferenceCountedObjectBase, ISwitchV2, IDisposable, IAscom
         ///     Initializes a new instance of the <see cref="Switch" /> class.
         /// </summary>
         public Switch()
-            {
-#if DEBUG_IN_EXTERNAL_APP
-            MessageBox.Show("Attach debugger now");
-#endif
-            //HandleAssemblyResolveEvents();
-            //device = CompositionRoot.GetDeviceLayer();
+        {
             clientId = SharedResources.ConnectionManager.RegisterClient(SharedResources.SwitchDriverId);
-            }
+        }
 
         internal bool IsOnline => device?.IsOnline ?? false;
 
         [MustBeConnected]
         public string Action(string ActionName, string ActionParameters)
-            {
+        {
             throw new NotImplementedException();
-            }
+        }
 
         public bool CanWrite(short id) => true;
 
         public void CommandBlind(string Command, bool Raw = false)
-            {
+        {
             throw new NotImplementedException();
-            }
+        }
 
         public bool CommandBool(string Command, bool Raw = false)
-            {
+        {
             throw new NotImplementedException();
-            }
+        }
 
         public string CommandString(string Command, bool Raw = false)
-            {
+        {
             throw new NotImplementedException();
-            }
+        }
 
         /// <summary>
         ///     Gets or sets the connection state.
@@ -103,10 +94,10 @@ public bool Connected
         public string Description => "Arduino Power Controller";
 
         public void Dispose()
-            {
+        {
             Dispose(true);
             GC.SuppressFinalize(this);
-            }
+        }
 
         /// <summary>
         ///     Descriptive and version information about this ASCOM driver.
@@ -135,8 +126,7 @@ public string DriverVersion
 
         public string GetSwitchDescription(short id) => $"Relay {id}";
 
-
-        public string GetSwitchName(short id) => Settings.Default.SwitchNames[id] ?? $"Relay {id}";
+        public string GetSwitchName(short id) => Settings.Default.SwitchNames?[id] ?? $"Relay {id}";
 
         /// <summary>
         ///     Returns the value for switch device id as a double
@@ -168,32 +158,32 @@ public string DriverVersion
 
         [MustBeConnected]
         public void SetSwitch(short id, bool state)
-            {
+        {
             var relay = (ushort) id;
             if (state) device.SetRelay(relay);
             else device.ClearRelay(relay);
             shadow = shadow.WithBitSetTo(id, state);
-            }
+        }
 
         public void SetSwitchName(short id, string name)
-            {
+        {
             Settings.Default.SwitchNames[id] = string.IsNullOrWhiteSpace(name) ? $"Relay {id}" : name;
             Settings.Default.Save();
-            }
+        }
 
         /// <summary>
         ///     Set the value for this device as a double.
         /// </summary>
         [MustBeConnected]
         public void SetSwitchValue(short id, double value)
-            {
+        {
             SetSwitch(id, value > 0.0);
-            }
+        }
 
         public void SetupDialog()
-            {
+        {
             SharedResources.DoSetupDialog(clientId);
-            }
+        }
 
         /// <summary>
         ///     Returns the list of action names supported by this driver (currently none supported).
@@ -213,63 +203,53 @@ public void SetupDialog()
         ///     is was offline.
         /// </exception>
         private void Connect()
-            {
+        {
             device = SharedResources.ConnectionManager.GoOnline(clientId);
             if (!device.IsOnline)
-                {
+            {
                 log.Error("Connect failed - device reported offline");
                 throw new DriverException(
                     "Failed to connect. Open apparently succeeded but then the device reported that is was offline.");
-                }
-            device.PerformOnConnectTasks();
             }
+            device.PerformOnConnectTasks();
+        }
 
         private void CreateSwitchNames()
-            {
+        {
             Settings.Default.SwitchNames = new StringCollection();
             for (var i = 0; i < MaxSwitch; i++)
-                {
+            {
                 Settings.Default.SwitchNames.Add($"Relay {i}");
-                }
             }
+        }
 
         /// <summary>
         ///     Disconnects from the device.
         /// </summary>
         private void Disconnect()
-            {
+        {
             SharedResources.ConnectionManager.GoOffline(clientId);
             device = null; //[Sentinel]
-            }
+        }
 
         protected virtual void Dispose(bool fromUserCode)
-            {
+        {
             if (!disposed)
-                {
+            {
                 if (fromUserCode)
-                    {
+                {
                     SharedResources.ConnectionManager.UnregisterClient(clientId);
-                    }
                 }
-            disposed = true;
             }
-
+            disposed = true;
+        }
 
         /// <summary>
         ///     Finalizes this instance (called prior to garbage collection by the CLR)
         /// </summary>
         ~Switch()
-            {
+        {
             Dispose(false);
-            }
-
-        /// <summary>
-        ///     Installs a custom assembly resolver into the AppDomain so that the driver can find its
-        ///     referenced assemblies. This avoids the need for strong-naming
-        /// </summary>
-        private void HandleAssemblyResolveEvents()
-            {
-            AppDomain.CurrentDomain.AssemblyResolve += AscomDriverAssemblyResolver.ResolveSupportAssemblies;
-            }
         }
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/ClientConnectionManager.cs b/TA.ArduinoPowerController.Server/ClientConnectionManager.cs
index debe9d8..de4db18 100644
--- a/TA.ArduinoPowerController.Server/ClientConnectionManager.cs
+++ b/TA.ArduinoPowerController.Server/ClientConnectionManager.cs
@@ -5,16 +5,18 @@
 // 
 // File: ClientConnectionManager.cs  Last modified: 2017-03-16@23:33 by Tim Long
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
-using NLog;
+using Ninject;
 using PostSharp.Patterns.Model;
 using PostSharp.Patterns.Threading;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using TA.ArduinoPowerController.DeviceInterface;
 using TA.Ascom.ReactiveCommunications;
 using TA.PostSharp.Aspects;
+using TA.Utils.Core;
+using TA.Utils.Core.Diagnostics;
 
 namespace TA.ArduinoPowerController.Server
     {
@@ -26,7 +28,7 @@ namespace TA.ArduinoPowerController.Server
     [NLogTraceWithArguments]
     public class ClientConnectionManager
         {
-        [Reference] private readonly ILogger log = LogManager.GetCurrentClassLogger();
+        [Reference] private readonly ILog log;
         private readonly bool performActionsOnOpen;
         [Reference] private Maybe<DeviceController> controllerInstance;
         [Reference] private ITransactionProcessorFactory factory;
@@ -38,8 +40,11 @@ public class ClientConnectionManager
         ///     A factory class that can create and destroy transaction processors (and by implication,
         ///     the entire communications stack).
         /// </param>
-        public ClientConnectionManager(ITransactionProcessorFactory factory) : this(factory,
-            performActionsOnOpen: true) {}
+        public ClientConnectionManager(ITransactionProcessorFactory factory, ILog logService) : this(factory,
+            performActionsOnOpen: true)
+            {
+            this.log = logService;
+            }
 
         /// <summary>
         ///     Initializes a new instance of the <see cref="ClientConnectionManager" /> class and allows
@@ -90,7 +95,7 @@ internal ITransactionProcessorFactory TransactionProcessorFactory
             get { return factory; }
             set
                 {
-                log.Warn("Setting the TransactionProcessorFactory");
+                log.Warn().Message("Setting the TransactionProcessorFactory").Write();
                 if (OnlineClientCount > 0)
                     throw new InvalidOperationException(
                         "Cannot change or set the Transaction Processor Factory while there are connected clients");
@@ -115,8 +120,9 @@ private void EnsureControllerInstanceCreatedAndOpen()
             {
             if (!controllerInstance.Any())
                 {
-                var controller = new DeviceController(factory);
-                controllerInstance = new Maybe<DeviceController>(controller);
+                CompositionRoot.BeginSessionScope();    // Starting a new session
+                var controller = CompositionRoot.Kernel.Get<DeviceController>();
+                controllerInstance = Maybe<DeviceController>.From(controller);
                 }
             var instance = controllerInstance.Single();
             if (!instance.IsOnline)
@@ -128,7 +134,7 @@ private void EnsureControllerInstanceCreatedAndOpen()
         [Writer]
         public void GoOffline(Guid clientId)
             {
-            log.Info($"Go offline for client {clientId}");
+            log.Info().Message("Go offline for client {clientId}", clientId).Write();
             ClientStatus client = null;
             try
                 {
@@ -136,15 +142,16 @@ public void GoOffline(Guid clientId)
                 }
             catch (InvalidOperationException e)
                 {
-                var message = $"Attempt to go offline by unecognized client {clientId}";
-                log.Error(e, message);
-                //ThrowOnUnrecognizedClient(clientId, e, message);
+                log.Error()
+                    .Exception(e)
+                    .Message("Attempt to go offline by unecognized client {clientId}", clientId)
+                    .Write();
                 }
             client.Online = false;
             RaiseClientStatusChanged();
             if (OnlineClientCount == 0)
                 {
-                log.Warn($"The last client has gone offline - closing connection");
+                log.Warn().Message("The last client has gone offline - closing connection").Write();
                 if (controllerInstance.Any())
                     {
                     controllerInstance.Single().Close();
@@ -167,7 +174,7 @@ public void GoOffline(Guid clientId)
         [Writer]
         public DeviceController GoOnline(Guid clientId)
             {
-            log.Info($"Go online for client {clientId}");
+            log.Info().Message("Go online for client {clientId}", clientId).Write();
             ClientStatus client = null;
             try
                 {
@@ -175,8 +182,10 @@ public DeviceController GoOnline(Guid clientId)
                 }
             catch (InvalidOperationException e)
                 {
-                var message = $"Attempt to go online with unregistered client {clientId}";
-                log.Error(e, message);
+                log.Error()
+                    .Exception(e)
+                    .Message("Attempt to go online with unregistered client {clientId}", clientId)
+                    .Write();
                 //ThrowOnUnrecognizedClient(clientId, e, message);
                 }
             try
@@ -185,7 +194,10 @@ public DeviceController GoOnline(Guid clientId)
                 }
             catch (TransactionException trex)
                 {
-                log.Error(trex, $"NOT CONNECTED due to transaction exception: {trex.Transaction}");
+                log.Error()
+                    .Exception(trex)
+                    .Message("NOT CONNECTED due to transaction exception in {transaction}", trex.Transaction)
+                    .Write();
                 DestroyControllerInstance();
                 return null;
                 }
@@ -219,7 +231,7 @@ protected void RaiseClientStatusChanged()
         public Guid RegisterClient(string name = null)
             {
             var id = Guid.NewGuid();
-            var status = new ClientStatus {ClientId = id, Name = name ?? id.ToString(), Online = false};
+            var status = new ClientStatus { ClientId = id, Name = name ?? id.ToString(), Online = false };
             Clients.Add(status);
             RaiseClientStatusChanged();
             return id;
@@ -237,25 +249,29 @@ private void ThrowOnUnrecognizedClient(Guid clientId, Exception e, string messag
             var ex = new ASCOM.InvalidOperationException($"Connection Manager: {message}", e);
             ex.Data["RegisteredClients"] = Clients;
             ex.Data["UnknownClient"] = clientId;
-            log.Error(ex, $"Client not found: {clientId}");
+            log.Error()
+                .Exception(ex).Message("Client not found: {clientId}", clientId)
+                .Property("registeredClients", Clients)
+                .Write();
             throw ex;
             }
 
         [Writer]
         public void UnregisterClient(Guid clientId)
             {
-            log.Info($"Unregistering client {clientId}");
+            log.Info().Message("Unregistering client {clientId}", clientId).Write();
             var previousClientCount = RegisteredClientCount;
             try
                 {
                 Clients.Remove(Clients.Single(p => p.Equals(clientId)));
                 RaiseClientStatusChanged();
                 }
-            catch (InvalidOperationException e)
+            catch (InvalidOperationException)
                 {
                 var message = $"Attempt to unregister unknown client {clientId}";
-                log.Error(e, message);
-                //ThrowOnUnrecognizedClient(clientId, e, "Attempt to unregister an unknown client");
+                log.Error()
+                    .Message("Attempt to unregister unknown client {clientId}", clientId)
+                    .Write();
                 }
             if (previousClientCount == 1 && RegisteredClientCount == 0)
                 {
diff --git a/TA.ArduinoPowerController.Server/CompositionRoot.cs b/TA.ArduinoPowerController.Server/CompositionRoot.cs
new file mode 100644
index 0000000..fa841ec
--- /dev/null
+++ b/TA.ArduinoPowerController.Server/CompositionRoot.cs
@@ -0,0 +1,127 @@
+// This file is part of the TA.WeatherListener project
+// 
+// Copyright © 2016-2018 Tigra Astronomy, all rights reserved.
+// 
+// File: CompositionRoot.cs  Last modified: 2018-04-04@01:29 by Tim Long
+
+using Ninject;
+using Ninject.Activation;
+using Ninject.Modules;
+using Ninject.Planning.Bindings.Resolvers;
+using Ninject.Syntax;
+using System.IO;
+using System.Reflection;
+using TA.ArduinoPowerController.DeviceInterface;
+using TA.ArduinoPowerController.Server.Properties;
+using TA.Ascom.ReactiveCommunications;
+using TA.Utils.Core.Diagnostics;
+using TA.Utils.Logging.NLog;
+
+namespace TA.ArduinoPowerController.Server
+    {
+    public static class CompositionRoot
+        {
+        static CompositionRoot()
+            {
+            var appAssembly = Assembly.GetExecutingAssembly();
+            var appPath = appAssembly.Location;
+            var appDirectory = Path.GetDirectoryName(appPath);
+            var pluginLocation = Path.Combine(appDirectory, "Plugins");
+            Kernel = new StandardKernel(new CoreModule(), new LoggingCompositionModule());
+            Kernel.Components
+                .Remove<IMissingBindingResolver, SelfBindingResolver>();
+            //Kernel.Components.Add<IMissingBindingResolver, DefaultValueBindingResolver>();
+            }
+
+        public static IKernel Kernel { get; }
+
+        public static ILog LogService => Kernel.Get<ILog>();
+        private static ScopeObject CurrentScope { get; set; }
+
+
+        public static void BeginSessionScope()
+            {
+            var log = LogService;
+            var scope = new ScopeObject();
+            log.Info()
+                .Message("Beginning session scope id={ScopeId}", scope.ScopeId)
+                .Write();
+            CurrentScope = scope;
+            }
+
+        public static IBindingNamedWithOrOnSyntax<T> InSessionScope<T>(this IBindingInSyntax<T> binding)
+            {
+            return binding.InScope(ctx => CurrentScope);
+            }
+        }
+
+    internal class ScopeObject
+        {
+        private static int scopeId;
+
+        public ScopeObject()
+            {
+            ++scopeId;
+            }
+
+        public int ScopeId => scopeId;
+        }
+
+    internal class CoreModule : NinjectModule
+        {
+        public override void Load()
+            {
+            var settingsId = SharedResources.SwitchDriverId;
+            var lastDot = settingsId.LastIndexOf('.');
+            var deviceType = settingsId.Substring(lastDot + 1);
+            Bind<DeviceController>().ToSelf().InSessionScope();
+            Bind<ICommunicationChannel>()
+                .ToMethod(BuildCommunicationsChannel)
+                .InSessionScope();
+            Bind<ChannelFactory>().ToSelf().InSessionScope();
+            Bind<ServerStatusDisplay>().ToSelf().InSingletonScope();
+            Bind<ITransactionProcessorFactory>().ToMethod(CreateTransactionProcessorFactory).InTransientScope();
+            Bind<ClientConnectionManager>().ToSelf().InSingletonScope();
+            }
+
+        private static ITransactionProcessorFactory CreateTransactionProcessorFactory(IContext _)
+            {
+            string connectionString = Settings.Default.ConnectionString;
+            var log = CompositionRoot.Kernel.Get<ILog>();
+            log.Info()
+                .Message("Creating transaction processor factory with connection string {connectionString}", connectionString)
+                .Write();
+            return new ReactiveTransactionProcessorFactory(connectionString ?? "(not set)");
+            }
+
+        private ICommunicationChannel BuildCommunicationsChannel(IContext context)
+            {
+            var channelFactory = Kernel.Get<ChannelFactory>();
+            var channel = channelFactory.FromConnectionString(Settings.Default.ConnectionString);
+            return channel;
+            }
+        }
+
+    internal class LoggingCompositionModule : NinjectModule
+        {
+        public override void Load()
+            {
+            Bind<ILog>().ToMethod(CreateLoggerForClass).InTransientScope();
+            Bind<LoggingService>().ToSelf().InTransientScope();
+            }
+
+        private ILog CreateLoggerForClass(IContext context)
+            {
+            var callerName = context.Request.GetType().Name;
+            return Kernel.Get<LoggingService>().WithAmbientProperty("LoggerName", callerName);
+            }
+        }
+
+    internal class PowerControllerCompositionModule : NinjectModule
+        {
+        public override void Load()
+            {
+            Bind<DeviceController>().ToSelf().InSingletonScope();
+            }
+        }
+    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/DriverDiscovery.cs b/TA.ArduinoPowerController.Server/DriverDiscovery.cs
new file mode 100644
index 0000000..a230dba
--- /dev/null
+++ b/TA.ArduinoPowerController.Server/DriverDiscovery.cs
@@ -0,0 +1,72 @@
+// This file is part of the TA.ArduinoPowerController project
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: DriverDiscovery.cs  Last modified: 2019-09-07@05:21 by Tim Long
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using ASCOM;
+using NLog.Fluent;
+
+namespace TA.ArduinoPowerController.Server
+{
+    /// <summary>
+    /// Discovers and stores a list of all types within this assembly that implement one of the ASCOM
+    /// device interfaces. These are identified by the presence of a <see cref="ServedClassNameAttribute"/>
+    /// on the class.
+    /// </summary>
+    /// <seealso cref="System.MarshalByRefObject" />
+    internal class DriverDiscovery
+    {
+        /// <summary>
+        ///     Gets the full assembly name of the LocalServer assembly
+        /// </summary>
+        public string DiscoveredAssemblyName { get; private set; } = string.Empty;
+
+        /// <summary>
+        ///     Gets the discovered types that were found to be decorated with the <see cref="ServedClassNameAttribute" />
+        ///     attribute.
+        /// </summary>
+        /// <value>A list of the discovered types.</value>
+        public List<Type> DiscoveredTypes { get; } = new List<Type>();
+
+        /// <summary>
+        ///     Discovers types within the LocalServer assembly that are decorated with the
+        ///     <see cref="ServedClassNameAttribute" />, which identifies an ASCOM driver
+        ///     that should be served by the LocalServer.
+        /// </summary>
+        public void DiscoverServedClasses()
+        {
+            Log.Info().Message("Loading served COM classes").Write();
+            var thisAssembly = Assembly.GetExecutingAssembly();
+            var assemblyName = thisAssembly.GetName();
+            var assemblyFullName = assemblyName.FullName;
+            var assemblyDisplayName = assemblyName.Name;
+            var types = thisAssembly.GetTypes();
+            Log.Trace()
+                .Message("Reflection found {typeCount} types in assembly {assemblyName}",
+                    types.Length, assemblyDisplayName)
+                .Write();
+            var servedClasses = from type in types.AsParallel()
+                                let memberInfo = (MemberInfo) type
+                                let safeAttributes = CustomAttributeData.GetCustomAttributes(memberInfo)
+                                where safeAttributes.Any(
+                                    p => p.AttributeType.Name == nameof(ServedClassNameAttribute))
+                                select type;
+            var discoveredTypes = servedClasses.ToList();
+            if (discoveredTypes.Any())
+            {
+                DiscoveredTypes.AddRange(discoveredTypes);
+                DiscoveredAssemblyName = assemblyFullName;
+                Log.Info()
+                    .Message("Discovered {servedClassCount} served classes in assembly {assembly}",
+                        discoveredTypes.Count, assemblyName)
+                    .Write();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/LocalServer.cs b/TA.ArduinoPowerController.Server/LocalServer.cs
index 553f331..c95ec97 100644
--- a/TA.ArduinoPowerController.Server/LocalServer.cs
+++ b/TA.ArduinoPowerController.Server/LocalServer.cs
@@ -1,16 +1,16 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: LocalServer.cs  Last modified: 2017-04-02@18:43 by Tim Long
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: LocalServer.cs  Last modified: 2019-09-07@06:25 by Tim Long
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
-using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
@@ -19,15 +19,15 @@
 using ASCOM;
 using ASCOM.Utilities;
 using Microsoft.Win32;
-using NLog;
+using NLog.Fluent;
+using TA.ArduinoPowerController.Server.Properties;
 using TA.PostSharp.Aspects;
+using TA.Utils.Core;
 
 namespace TA.ArduinoPowerController.Server
-    {
+{
     public static class Server
-        {
-        private static readonly ILogger Log = LogManager.GetCurrentClassLogger();
-
+    {
         // This property returns the main thread's id.
         public static uint MainThreadId { get; private set; } // Stores the main thread's thread id.
 
@@ -35,24 +35,35 @@ public static class Server
         public static bool StartedByCOM { get; private set; } // True if server started by COM (-embedding)
 
         #region SERVER ENTRY POINT (main)
+
         //
         // ==================
         // SERVER ENTRY POINT
         // ==================
         //
         [STAThread]
-        [NLogTraceWithArguments]
         private static void Main(string[] args)
-            {
+        {
             // Manage unhandled exceptions
             Application.ThreadException += UnhandledThreadException;
             AppDomain.CurrentDomain.UnhandledException += UnhandledException;
+            Log.Info().Message("===== Application Start =====").Write();
+            LogVersionStrings();
 
-            var foundTypes = LoadComObjectAssemblies();
-            if (foundTypes < 1)
-                return; // There is no point continuing if we found nothing to serve.
+            AssureSwitchNamesAreValid();    // Avoid some tricky null reference exceptions
 
-            if (!ProcessArguments(args)) return; // Register/Unregister
+            var drivers = new DriverDiscovery();
+            drivers.DiscoverServedClasses();
+            if (!drivers.DiscoveredTypes.Any())
+            {
+                Log.Fatal()
+                    .Message(
+                        "No driver classes found. Have you added ServedClassName attributes to your driver classes?")
+                    .Write();
+                return;
+            }
+
+            if (!ProcessArguments(drivers, args)) return; // Register/Unregister
 
             // Initialize critical member variables.
             objsInUse = 0;
@@ -60,19 +71,19 @@ private static void Main(string[] args)
             MainThreadId = GetCurrentThreadId();
             Thread.CurrentThread.Name = "Main Thread";
 
+            // Create the user interface and display it
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            s_MainForm = new ServerStatusDisplay();
-//#if !DEBUG
-//// Only show the application main window if it was started manually by the user.
-//            if (StartedByCOM) s_MainForm.WindowState = FormWindowState.Minimized;
-//#endif
-
-            // Register the class factories of the served objects
-            RegisterClassFactories();
-
-            // Start up the garbage collection thread.
-            var GarbageCollector = new GarbageCollection(1000);
+            var statusDisplay = new ServerStatusDisplay();
+            /*
+             * If you do not wish your main form to display when started automatically
+             * by a client app, then minimize it to the task bar here.
+             */
+            //if (StartedByCOM) s_MainForm.WindowState = FormWindowState.Minimized;
+
+            var registeredFactories = RegisterClassFactories(drivers);
+            // ToDo: [TPL] Why is this even necessary? Shouldn't GC be automatic?
+            var GarbageCollector = new GarbageCollection(10000);
             var GCThread = new Thread(GarbageCollector.GCWatch);
             GCThread.Name = "Garbage Collection Thread";
             GCThread.Start();
@@ -82,146 +93,153 @@ private static void Main(string[] args)
             // served COM objects, making this act like the VB6 equivalent!
             //
             try
-                {
-                Application.Run(s_MainForm);
-                }
+            {
+                Application.Run(statusDisplay);
+            }
             finally
-                {
+            {
                 // Revoke the class factories immediately.
                 // Don't wait until the thread has stopped before
                 // we perform revocation!!!
-                RevokeClassFactories();
+                RevokeClassFactories(registeredFactories);
 
                 // Now stop the Garbage Collector thread.
                 GarbageCollector.StopThread();
                 GarbageCollector.WaitForThreadToStop();
                 Application.ThreadException -= UnhandledThreadException;
                 AppDomain.CurrentDomain.UnhandledException -= UnhandledException;
+            }
+        }
+
+        private static void AssureSwitchNamesAreValid()
+            {
+            if (Settings.Default.SwitchNames is null)
+                {
+                Log.Warn()
+                    .Message("No switch names found. Setting default names for {count} switches.", Settings.Default.NumberOfSwitches)
+                    .Write();
+                var names = new StringCollection();
+                for (int i = 0; i < Settings.Default.NumberOfSwitches; i++)
+                    names.Add($"Switch {i}");
+                Settings.Default.SwitchNames = names;
+                Settings.Default.Save();
+                }
+            var nameCount = Settings.Default.SwitchNames.Count;
+            var switchCount = Settings.Default.NumberOfSwitches;
+            if ( nameCount < switchCount)
+                {
+                Log.Warn()
+                    .Message("{nameCount} names found for {switchCount} switches. Setting additional default names.",
+                    nameCount, switchCount)
+                    .Write();
+                for (int i = nameCount; i < switchCount; i++)
+                    Settings.Default.SwitchNames.Add($"Switch {i}");
+                Settings.Default.Save();
                 }
+            // We don't worry about extra names as those are ignored.
             }
+
         #endregion
 
+        private static void LogVersionStrings()
+        {
+            Log.Info().Message("Semantic version: {semVer}", GitVersion.GitSemVer).Write();
+            Log.Debug().Message("Informational Version: {informationalVersion}", GitVersion.GitInformationalVersion).Write();
+            Log.Debug().Message("Git Commit ID: {fullCommit}", GitVersion.GitCommitSha).Write();
+            Log.Debug().Message("Git Short ID: {shortCommit}", GitVersion.GitCommitShortSha).Write();
+            Log.Debug().Message("Commit Date: {commitDate}", GitVersion.GitCommitDate).Write();
+        }
+
+
         #region Command Line Arguments
+
         //
         // ProcessArguments() will process the command-line arguments
         // If the return value is true, we carry on and start this application.
         // If the return value is false, we terminate this application immediately.
         //
-        private static bool ProcessArguments(string[] args)
-            {
+        private static bool ProcessArguments(DriverDiscovery drivers, string[] args)
+        {
             var bRet = true;
 
             //
             //**TODO** -Embedding is "ActiveX start". Prohibit non_AX starting?
             //
             if (args.Length > 0)
-                {
+            {
                 switch (args[0].ToLower())
-                    {
-                        case "-embedding":
-                            StartedByCOM = true; // Indicate COM started us
-                            break;
-
-                        case "-register":
-                        case @"/register":
-                        case "-regserver": // Emulate VB6
-                        case @"/regserver":
-                            RegisterObjects(); // Register each served object
-                            bRet = false;
-                            break;
-
-                        case "-unregister":
-                        case @"/unregister":
-                        case "-unregserver": // Emulate VB6
-                        case @"/unregserver":
-                            UnregisterObjects(); //Unregister each served object
-                            bRet = false;
-                            break;
-
-                        default:
-                            MessageBox.Show(
-                                "Unknown argument: " + args[0] + "\nValid are : -register, -unregister and -embedding",
-                                "ASCOM driver for Arduino Power Controller", MessageBoxButtons.OK,
-                                MessageBoxIcon.Exclamation);
-                            break;
-                    }
+                {
+                    case "-embedding":
+                        StartedByCOM = true; // Indicate COM started us
+                        break;
+
+                    case "-register":
+                    case @"/register":
+                    case "-regserver": // Emulate VB6
+                    case @"/regserver":
+                        RegisterObjects(drivers); // Register each served object
+                        bRet = false;
+                        break;
+
+                    case "-unregister":
+                    case @"/unregister":
+                    case "-unregserver": // Emulate VB6
+                    case @"/unregserver":
+                        UnregisterObjects(drivers); //Unregister each served object
+                        bRet = false;
+                        break;
+
+                    default:
+                        MessageBox.Show(
+                            "Unknown argument: " + args[0] + "\nValid are : -register, -unregister and -embedding",
+                            "ASCOM driver for Arduino Power Controller", MessageBoxButtons.OK,
+                            MessageBoxIcon.Exclamation);
+                        break;
                 }
+            }
             else
                 StartedByCOM = false;
 
             return bRet;
-            }
+        }
+
         #endregion
 
+        #region Unhandled Exceptions
+
+        /*
+         * If you write multi-threaded or asynchronous code, it is quite easy to accidentally
+         * "leak" unhandled exceptions that bring down the entire process. To avoid that, we define
+         * some top level event handlers that deal with these exception leaks by writing them to the log.
+         */
         private static void UnhandledException(object sender, UnhandledExceptionEventArgs ea)
-            {
-            Log.Error((Exception) ea.ExceptionObject, "Unhandled exception");
-            }
+        {
+            Exception ex = ea.ExceptionObject as Exception ?? new ApplicationException("Non-exception object thrown");
+            Log.Error()
+                .Exception(ex)
+                .Message("Unhandled exception: {message}", ex.Message)
+                .Write();
+        }
 
         private static void UnhandledThreadException(object sender, ThreadExceptionEventArgs ea)
-            {
-            Log.Error(ea.Exception, "Unhandled thread exception");
-            }
+        {
+            Log.Error()
+                .Exception(ea.Exception)
+                .Message("Unhandled thread exception: {message}", ea.Exception.Message)
+                .Write();
+        }
+
+        #endregion Unhandled Exceptions
 
         // -----------------
         // PRIVATE FUNCTIONS
         // -----------------
 
-        #region Dynamic Driver Assembly Loader
-        /// <summary>
-        ///     Load the assemblies that we will serve via COM. These will be located in the same
-        ///     folder as out executable and will have at least one type decorated with a
-        ///     <see cref="ServedClassNameAttribute" />
-        /// </summary>
-        /// <returns>The count of types found.</returns>
-        private static int LoadComObjectAssemblies()
-            {
-            Log.Info("Loading served COM classes");
-            try
-                {
-                // Discover assemblies and types to be served in Reflection Only context in an isolated AppDomain
-                using (var reflectionContext = new AppDomainIsolated<ServedComClassLocator>())
-                    {
-                    reflectionContext.Worker.DiscoverServedClasses();
-                    s_ComObjectAssys = new List<string>(reflectionContext.Worker.DiscoveredAssemblyNames);
-                    s_ComObjectTypes = new List<Type>(reflectionContext.Worker.DiscoveredTypes);
-                    }
-                // Now load the discovered assemblies into the current domain's execution context
-                foreach (var assemblyName in s_ComObjectAssys)
-                    {
-                    Assembly.Load(assemblyName);
-                    }
-                return s_ComObjectTypes.Count;
-                }
-            finally
-                {
-                AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve -= CurrentDomainOnReflectionOnlyAssemblyResolve;
-                }
-            }
-
-        private static Assembly CurrentDomainOnReflectionOnlyAssemblyResolve(object sender, ResolveEventArgs args)
-            {
-            try
-                {
-                Log.Info(
-                    $"Event: ReflectionOnlyResolveAssembly for {args.Name} requested by {args.RequestingAssembly.GetName().Name}",
-                    args.Name);
-                var resolved = Assembly.ReflectionOnlyLoad(args.Name);
-                Log.Info($"Successfully resolved assembly with {resolved.FullName}");
-                return resolved;
-                }
-            catch (FileLoadException ex)
-                {
-                Log.Error(ex, $"Failed to resolve assembly: {args.Name}");
-                return null; // Let the app raise its own error.
-                }
-            }
-        #endregion
-
         #region Access to kernel32.dll, user32.dll, and ole32.dll functions
+
         [Flags]
         private enum CLSCTX : uint
-            {
+        {
             CLSCTX_INPROC_SERVER = 0x1,
             CLSCTX_INPROC_HANDLER = 0x2,
             CLSCTX_LOCAL_SERVER = 0x4,
@@ -243,31 +261,33 @@ private enum CLSCTX : uint
             CLSCTX_INPROC = CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER,
             CLSCTX_SERVER = CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER,
             CLSCTX_ALL = CLSCTX_SERVER | CLSCTX_INPROC_HANDLER
-            }
+        }
 
         [Flags]
         private enum COINIT : uint
-            {
+        {
             /// Initializes the thread for multi-threaded object concurrency.
             COINIT_MULTITHREADED = 0x0,
+
             /// Initializes the thread for apartment-threaded object concurrency.
             COINIT_APARTMENTTHREADED = 0x2,
+
             /// Disables DDE for Ole1 support.
             COINIT_DISABLE_OLE1DDE = 0x4,
+
             /// Trades memory for speed.
             COINIT_SPEED_OVER_MEMORY = 0x8
-            }
+        }
 
         [Flags]
         private enum REGCLS : uint
-            {
+        {
             REGCLS_SINGLEUSE = 0,
             REGCLS_MULTIPLEUSE = 1,
             REGCLS_MULTI_SEPARATE = 2,
             REGCLS_SUSPENDED = 4,
             REGCLS_SURROGATE = 8
-            }
-
+        }
 
         // CoInitializeEx() can be used to set the apartment model
         // of individual threads.
@@ -280,7 +300,7 @@ private enum REGCLS : uint
 
         // PostThreadMessage() allows us to post a Windows Message to
         // a specific thread (identified by its thread id).
-        // We will need this API to post a WM_QUIT message to the main 
+        // We will need this API to post a WM_QUIT message to the main
         // thread in order to terminate this application.
         [DllImport("user32.dll")]
         private static extern bool PostThreadMessage(uint idThread, uint Msg, UIntPtr wParam,
@@ -291,45 +311,45 @@ private static extern bool PostThreadMessage(uint idThread, uint Msg, UIntPtr wP
         // the main thread.
         [DllImport("kernel32.dll")]
         private static extern uint GetCurrentThreadId();
+
         #endregion
 
         #region Private Data
+
         private static int objsInUse; // Keeps a count on the total number of objects alive.
         private static int serverLocks; // Keeps a lock count on this application.
-        private static ServerStatusDisplay s_MainForm; // Reference to our main form
-        private static List<string> s_ComObjectAssys; // Dynamically loaded assemblies containing served COM objects
-        private static List<Type> s_ComObjectTypes; // Served COM object types
-        private static ArrayList s_ClassFactories; // Served COM object class factories
         private static readonly string s_appId = "{50e4c255-0a0e-4276-bd33-aae742da21b1}"; // Our AppId
         private static readonly object lockObject = new object();
+
         #endregion
 
         #region Server Lock, Object Counting, and AutoQuit on COM startup
+
         // Returns the total number of objects alive currently.
         public static int ObjectsCount
             {
             get
                 {
                 lock (lockObject)
-                    {
+                {
                     return objsInUse;
-                    }
+                }
                 }
             }
 
         // This method performs a thread-safe incrementation of the objects count.
         public static int CountObject()
-            {
+        {
             // Increment the global count of objects.
             return Interlocked.Increment(ref objsInUse);
-            }
+        }
 
         // This method performs a thread-safe decrementation the objects count.
         public static int UncountObject()
-            {
+        {
             // Decrement the global count of objects.
             return Interlocked.Decrement(ref objsInUse);
-            }
+        }
 
         // Returns the current server lock count.
         public static int ServerLockCount
@@ -337,59 +357,61 @@ public static int ServerLockCount
             get
                 {
                 lock (lockObject)
-                    {
+                {
                     return serverLocks;
-                    }
+                }
                 }
             }
 
-        // This method performs a thread-safe incrementation the 
+        // This method performs a thread-safe incrementation the
         // server lock count.
         public static int CountLock()
-            {
+        {
             // Increment the global lock count of this server.
             return Interlocked.Increment(ref serverLocks);
-            }
+        }
 
-        // This method performs a thread-safe decrementation the 
+        // This method performs a thread-safe decrementation the
         // server lock count.
         public static int UncountLock()
-            {
+        {
             // Decrement the global lock count of this server.
             return Interlocked.Decrement(ref serverLocks);
-            }
+        }
 
-        // AttemptToTerminateServer() will check to see if the objects count and the server 
+        // AttemptToTerminateServer() will check to see if the objects count and the server
         // lock count have both dropped to zero.
         //
         // If so, and if we were started by COM, we post a WM_QUIT message to the main thread's
-        // message loop. This will cause the message loop to exit and hence the termination 
+        // message loop. This will cause the message loop to exit and hence the termination
         // of this application. If hand-started, then just trace that it WOULD exit now.
         //
         public static void ExitIf()
-            {
+        {
             lock (lockObject)
-                {
+            {
                 if (ObjectsCount <= 0 && ServerLockCount <= 0)
-                    {
+                {
                     if (StartedByCOM)
-                        {
+                    {
                         var wParam = new UIntPtr(0);
                         var lParam = new IntPtr(0);
                         PostThreadMessage(MainThreadId, 0x0012, wParam, lParam);
-                        }
                     }
                 }
             }
+        }
 
         public static void TerminateLocalServer()
-            {
+        {
             if (StartedByCOM)
                 Application.Exit();
-            }
+        }
+
         #endregion
 
         #region COM Registration and Unregistration
+
         //
         // Test if running elevated
         //
@@ -407,48 +429,47 @@ private static bool IsAdministrator
         // Elevate by re-running ourselves with elevation dialog
         //
         private static void ElevateSelf(string arg)
-            {
+        {
             var si = new ProcessStartInfo();
             si.Arguments = arg;
             si.WorkingDirectory = Environment.CurrentDirectory;
             si.FileName = Application.ExecutablePath;
             si.Verb = "runas";
             try
-                {
+            {
                 Process.Start(si);
-                }
+            }
             catch (Win32Exception)
-                {
+            {
                 MessageBox.Show(
                     "The LocalServer was not " + (arg == "/register" ? "registered" : "unregistered") +
                     " because you did not allow it.", SharedResources.SwitchDriverId, MessageBoxButtons.OK,
                     MessageBoxIcon.Warning);
-                }
+            }
             catch (Exception ex)
-                {
+            {
                 MessageBox.Show(ex.ToString(), SharedResources.SwitchDriverId, MessageBoxButtons.OK,
                     MessageBoxIcon.Stop);
-                }
             }
+        }
 
-        //
-        // Do everything to register this for COM. Never use REGASM on
-        // this exe assembly! It would create InProcServer32 entries 
-        // which would prevent proper activation!
-        //
-        // Using the list of COM object types generated during dynamic
-        // assembly loading, it registers each one for COM as served by our
-        // exe/local server, as well as registering it for ASCOM. It also
-        // adds DCOM info for the local server itself, so it can be activated
-        // via an outboiud connection from TheSky.
-        //
-        private static void RegisterObjects()
-            {
+        /// <summary>
+        ///     Registers the discovered driver types for COM and with the ASCOM Profile Store.
+        /// </summary>
+        /// <param name="drivers">The discovered drivers.</param>
+        /// <remarks>
+        ///     Registers each discovered driver type with COM so that applications
+        ///     can find it and load it by ProgID (i.e. via the ASCOM Chooser).
+        ///     Also adds DCOM info for the LocalServer itself, so it can be activated
+        ///     via an outbound connection from TheSky.
+        /// </remarks>
+        private static void RegisterObjects(DriverDiscovery drivers)
+        {
             if (!IsAdministrator)
-                {
+            {
                 ElevateSelf("/register");
                 return;
-                }
+            }
             //
             // If reached here, we're running elevated
             //
@@ -463,41 +484,40 @@ private static void RegisterObjects()
             // Local server's DCOM/AppID information
             //
             try
-                {
+            {
                 //
                 // HKCR\APPID\appid
                 //
                 using (var key = Registry.ClassesRoot.CreateSubKey("APPID\\" + s_appId))
-                    {
+                {
                     key.SetValue(null, assyDescription);
                     key.SetValue("AppID", s_appId);
                     key.SetValue("AuthenticationLevel", 1, RegistryValueKind.DWord);
-                    }
+                }
                 //
                 // HKCR\APPID\exename.ext
                 //
                 using (var key = Registry.ClassesRoot.CreateSubKey(string.Format("APPID\\{0}",
                     Application.ExecutablePath.Substring(Application.ExecutablePath.LastIndexOf('\\') + 1))))
-                    {
+                {
                     key.SetValue("AppID", s_appId);
-                    }
                 }
+            }
             catch (Exception ex)
-                {
+            {
                 MessageBox.Show("Error while registering the server:\n" + ex,
                     SharedResources.SwitchDriverId, MessageBoxButtons.OK, MessageBoxIcon.Stop);
                 return;
-                }
-            finally {}
+            }
 
             //
             // For each of the driver assemblies
             //
-            foreach (var type in s_ComObjectTypes)
-                {
+            foreach (var type in drivers.DiscoveredTypes)
+            {
                 var bFail = false;
                 try
-                    {
+                {
                     //
                     // HKCR\CLSID\clsid
                     //
@@ -507,36 +527,36 @@ private static void RegisterObjects()
                     var deviceType = type.Name;
 
                     using (var key = Registry.ClassesRoot.CreateSubKey(string.Format("CLSID\\{0}", clsid)))
-                        {
+                    {
                         key.SetValue(null, progid); // Could be assyTitle/Desc??, but .NET components show ProgId here
                         key.SetValue("AppId", s_appId);
                         using (var key2 = key.CreateSubKey("Implemented Categories"))
-                            {
+                        {
                             key2.CreateSubKey("{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}");
-                            }
+                        }
                         using (var key2 = key.CreateSubKey("ProgId"))
-                            {
+                        {
                             key2.SetValue(null, progid);
-                            }
+                        }
                         key.CreateSubKey("Programmable");
                         using (var key2 = key.CreateSubKey("LocalServer32"))
-                            {
+                        {
                             key2.SetValue(null, Application.ExecutablePath);
-                            }
                         }
+                    }
                     //
                     // HKCR\progid
                     //
                     using (var key = Registry.ClassesRoot.CreateSubKey(progid))
-                        {
+                    {
                         key.SetValue(null, assyTitle);
                         using (var key2 = key.CreateSubKey("CLSID"))
-                            {
+                        {
                             key2.SetValue(null, clsid);
-                            }
                         }
+                    }
                     //
-                    // ASCOM 
+                    // ASCOM
                     //
                     assy = type.Assembly;
 
@@ -545,35 +565,34 @@ private static void RegisterObjects()
                     //PWGS Changed to search type for attribute rather than assembly
                     var chooserName = ((ServedClassNameAttribute) attr).DisplayName ?? "MultiServer";
                     using (var P = new Profile())
-                        {
+                    {
                         P.DeviceType = deviceType;
                         P.Register(progid, chooserName);
-                        }
                     }
+                }
                 catch (Exception ex)
-                    {
+                {
                     MessageBox.Show("Error while registering the server:\n" + ex,
                         SharedResources.SwitchDriverId, MessageBoxButtons.OK, MessageBoxIcon.Stop);
                     bFail = true;
-                    }
-                finally {}
-                if (bFail) break;
                 }
+                if (bFail) break;
             }
+        }
 
         //
-        // Remove all traces of this from the registry. 
+        // Remove all traces of this from the registry.
         //
         // **TODO** If the above does AppID/DCOM stuff, this would have
         // to remove that stuff too.
         //
-        private static void UnregisterObjects()
-            {
+        private static void UnregisterObjects(DriverDiscovery drivers)
+        {
             if (!IsAdministrator)
-                {
+            {
                 ElevateSelf("/unregister");
                 return;
-                }
+            }
 
             //
             // Local server's DCOM/AppID information
@@ -585,8 +604,8 @@ private static void UnregisterObjects()
             //
             // For each of the driver assemblies
             //
-            foreach (var type in s_ComObjectTypes)
-                {
+            foreach (var type in drivers.DiscoveredTypes)
+            {
                 var clsid = Marshal.GenerateGuidForType(type).ToString("B");
                 var progid = Marshal.GenerateProgIdForType(type);
                 var deviceType = type.Name;
@@ -611,51 +630,59 @@ private static void UnregisterObjects()
                 Registry.ClassesRoot.DeleteSubKey(string.Format("CLSID\\{0}\\Programmable", clsid), false);
                 Registry.ClassesRoot.DeleteSubKey(string.Format("CLSID\\{0}", clsid), false);
                 try
-                    {
+                {
                     //
                     // ASCOM
                     //
                     using (var P = new Profile())
-                        {
+                    {
                         P.DeviceType = deviceType;
                         P.Unregister(progid);
-                        }
                     }
-                catch (Exception) {}
+                }
+                catch (Exception)
+                {
                 }
             }
+        }
+
         #endregion
 
         #region Class Factory Support
+
         //
-        // On startup, we register the class factories of the COM objects
-        // that we serve. This requires the class facgtory name to be
+        // Register the class factories of the COM objects (drivers)
+        // that we serve. This requires the class factory name to be
         // equal to the served class name + "ClassFactory".
         //
-        private static bool RegisterClassFactories()
+        private static IEnumerable<ClassFactory> RegisterClassFactories(DriverDiscovery drivers)
+        {
+            var registeredFactories = new List<ClassFactory>();
+            foreach (var type in drivers.DiscoveredTypes)
             {
-            s_ClassFactories = new ArrayList();
-            foreach (var type in s_ComObjectTypes)
-                {
                 var factory = new ClassFactory(type); // Use default context & flags
-                s_ClassFactories.Add(factory);
-                if (!factory.RegisterClassObject())
-                    {
-                    MessageBox.Show("Failed to register class factory for " + type.Name,
-                        "TA.ArduinoPowerController.Server", MessageBoxButtons.OK, MessageBoxIcon.Stop);
-                    return false;
-                    }
+                if (factory.RegisterClassObject())
+                {
+                    registeredFactories.Add(factory);
+                }
+                else
+                {
+                    Log.Fatal()
+                        .Message("Failed to register class factory for {type}", type.Name)
+                        .Write();
                 }
-            ClassFactory.ResumeClassObjects(); // Served objects now go live
-            return true;
             }
+            ClassFactory.ResumeClassObjects(); // Served objects now go live
+            return registeredFactories;
+        }
 
-        private static void RevokeClassFactories()
-            {
+        private static void RevokeClassFactories(IEnumerable<ClassFactory> factories)
+        {
             ClassFactory.SuspendClassObjects(); // Prevent race conditions
-            foreach (ClassFactory factory in s_ClassFactories)
+            foreach (var factory in factories)
                 factory.RevokeClassObject();
-            }
-        #endregion
         }
-    }
\ No newline at end of file
+
+        #endregion
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/LocalServer.snk b/TA.ArduinoPowerController.Server/LocalServer.snk
deleted file mode 100644
index 97e4406..0000000
Binary files a/TA.ArduinoPowerController.Server/LocalServer.snk and /dev/null differ
diff --git a/TA.ArduinoPowerController.Server/NLog.Debug.config b/TA.ArduinoPowerController.Server/NLog.Debug.config
deleted file mode 100644
index 628a559..0000000
--- a/TA.ArduinoPowerController.Server/NLog.Debug.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- For more information on using transformations 
-     see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
-<nlog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform"
-      xmlns="http://www.nlog-project.org/schemas/NLog.xsd">
-  <rules xdt:Transform="Replace">
-    <logger name="*" minlevel="Trace" writeTo="DebugView" />
-    <logger name="*" minlevel="Debug" writeTo="LogFile" />
-  </rules>
-</nlog>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/NLog.Release.config b/TA.ArduinoPowerController.Server/NLog.Release.config
deleted file mode 100644
index 20fcb34..0000000
--- a/TA.ArduinoPowerController.Server/NLog.Release.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- For more information on using transformations 
-     see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
-<nlog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform"
-      xmlns="http://www.nlog-project.org/schemas/NLog.xsd">
-  <rules xdt:Transform="Replace">
-    <logger name="*" minlevel="Info" writeTo="DebugView" />
-    <logger name="*" minlevel="Warn" writeTo="LogFile" />
-  </rules>
-</nlog>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/NLog.config b/TA.ArduinoPowerController.Server/NLog.config
index 8e5b941..67e9f85 100644
--- a/TA.ArduinoPowerController.Server/NLog.config
+++ b/TA.ArduinoPowerController.Server/NLog.config
@@ -3,19 +3,21 @@
 <nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true">
 
-  <!-- 
-  See https://github.com/nlog/nlog/wiki/Configuration-file 
-  for information on customizing logging rules and outputs.
+  <!--
+  See https://github.com/nlog/nlog/wiki/Configuration-file
+  for information on customizing logging rules and formats.
    -->
   <targets async="true">
-    <target xsi:type="Trace" name="DebugView"
+    <!-- Log target for live viewing via SysInternals DebugView or in Visual Studio debugger -->
+    <target xsi:type="Trace" name="DebugView" rawWrite="True"
             layout="${time}|${pad:padding=-5:inner=${uppercase:${level}}}|${pad:padding=-16:inner=${callsite:className=true:fileName=false:includeSourcePath=false:methodName=false:includeNamespace=false}}|${message}" />
-    <target xsi:type="File" name="LogFile"
-            filename="${environment:variable=UserProfile}/logs/ASCOM.ArduinoPowerController.Server-${filesystem-normalize:fSNormalize=true:inner=${shortdate}-${windows-identity}-${machinename}.log}"
+    <!-- Log target for writing to ASCOM-style log file -->
+    <target xsi:type="File" name="ASCOM"
+            filename="${environment:variable=UserProfile}/logs/ASCOM.ArduinoPowerController.Server-${filesystem-normalize:fSNormalize=true:inner=${shortdate}-${machinename}-${windows-identity}.log}"
             layout="${time}|${pad:padding=-5:inner=${uppercase:${level}}}|${pad:padding=-16:inner=${callsite:className=true:fileName=false:includeSourcePath=false:methodName=false:includeNamespace=false}}|${message}" />
   </targets>
   <rules>
-    <logger name="*" minlevel="Warn" writeTo="DebugView" />
-    <logger name="*" minlevel="Warn" writeTo="LogFile" />
+    <logger name="*" minlevel="Trace" writeTo="DebugView" />
+    <logger name="*" minlevel="Info" writeTo="ASCOM" />
   </rules>
 </nlog>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/NLog.xsd b/TA.ArduinoPowerController.Server/NLog.xsd
deleted file mode 100644
index 4aa20b2..0000000
--- a/TA.ArduinoPowerController.Server/NLog.xsd
+++ /dev/null
@@ -1,2966 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema id="NLog" targetNamespace="http://www.nlog-project.org/schemas/NLog.xsd" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.nlog-project.org/schemas/NLog.xsd">
-  <xs:element name="nlog" type="NLogConfiguration" />
-  <xs:complexType name="NLogConfiguration">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="extensions" type="NLogExtensions" />
-      <xs:element name="include" type="NLogInclude" />
-      <xs:element name="variable" type="NLogVariable" />
-      <xs:element name="targets" type="NLogTargets" />
-      <xs:element name="rules" type="NLogRules" />
-      <xs:element name="time" type="TimeSource" />
-    </xs:choice>
-    <xs:attribute name="autoReload" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Watch config file for changes and reload automatically.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="internalLogToConsole" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Print internal NLog messages to the console. Default value is: false</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="internalLogToConsoleError" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Print internal NLog messages to the console error output. Default value is: false</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="internalLogFile" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Write internal NLog messages to the specified file.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="internalLogLevel" type="NLogLevel">
-      <xs:annotation>
-        <xs:documentation>Log level threshold for internal log messages. Default value is: Info.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="globalThreshold" type="NLogLevel">
-      <xs:annotation>
-        <xs:documentation>Global log level threshold for application log messages. Messages below this level won't be logged..</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="throwExceptions" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Throw an exception when there is an internal error. Default value is: false.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="throwConfigExceptions" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Throw an exception when there is a configuration error. If not set, determined by throwExceptions.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="keepVariablesOnReload" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Gets or sets a value indicating whether Variables should be kept on configuration reload. Default value is: false.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="internalLogToTrace" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Write internal NLog messages to the System.Diagnostics.Trace. Default value is: false.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="internalLogIncludeTimestamp" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Write timestamps for internal NLog messages. Default value is: true.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="useInvariantCulture" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Use InvariantCulture as default culture instead of CurrentCulture.  Default value is: false.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="NLogTargets">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="default-wrapper" type="WrapperTargetBase" />
-      <xs:element name="default-target-parameters" type="Target" />
-      <xs:element name="target" type="Target" />
-      <xs:element name="wrapper-target" type="WrapperTargetBase" />
-      <xs:element name="compound-target" type="CompoundTargetBase" />
-    </xs:choice>
-    <xs:attribute name="async" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Make all targets within this section asynchronous (creates additional threads but the calling thread isn't blocked by any target writes).</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="NLogRules">
-    <xs:sequence minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="logger" type="NLogLoggerRule" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="NLogExtensions">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="add" type="NLogExtensionsAdd" />
-    </xs:choice>
-  </xs:complexType>
-  <xs:complexType name="NLogExtensionsAdd">
-    <xs:attribute name="prefix" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Prefix for targets/layout renderers/filters/conditions loaded from this assembly.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="assemblyFile" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Load NLog extensions from the specified file (*.dll)</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="assembly" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Load NLog extensions from the specified assembly. Assembly name should be fully qualified.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="NLogLoggerRule">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="filters" type="NLogFilters" />
-    </xs:choice>
-    <xs:attribute name="name" use="optional">
-      <xs:annotation>
-        <xs:documentation>Name of the logger. May include '*' character which acts like a wildcard. Allowed forms are: *, Name, *Name, Name* and *Name*</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="levels" type="NLogLevelList">
-      <xs:annotation>
-        <xs:documentation>Comma separated list of levels that this rule matches.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="minlevel" type="NLogLevel">
-      <xs:annotation>
-        <xs:documentation>Minimum level that this rule matches.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="maxlevel" type="NLogLevel">
-      <xs:annotation>
-        <xs:documentation>Maximum level that this rule matches.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="level" type="NLogLevel">
-      <xs:annotation>
-        <xs:documentation>Level that this rule matches.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="writeTo" type="NLogTargetIDList">
-      <xs:annotation>
-        <xs:documentation>Comma separated list of target names.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="final" type="xs:boolean" default="false">
-      <xs:annotation>
-        <xs:documentation>Ignore further rules if this one matches.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="enabled" type="xs:boolean" default="true">
-      <xs:annotation>
-        <xs:documentation>Enable or disable logging rule. Disabled rules are ignored.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="NLogFilters">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="when" type="when" />
-      <xs:element name="whenContains" type="whenContains" />
-      <xs:element name="whenEqual" type="whenEqual" />
-      <xs:element name="whenNotContains" type="whenNotContains" />
-      <xs:element name="whenNotEqual" type="whenNotEqual" />
-    </xs:choice>
-  </xs:complexType>
-  <xs:simpleType name="NLogLevel">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Off" />
-      <xs:enumeration value="Trace" />
-      <xs:enumeration value="Debug" />
-      <xs:enumeration value="Info" />
-      <xs:enumeration value="Warn" />
-      <xs:enumeration value="Error" />
-      <xs:enumeration value="Fatal" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="LineEndingMode">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Default" />
-      <xs:enumeration value="CRLF" />
-      <xs:enumeration value="CR" />
-      <xs:enumeration value="LF" />
-      <xs:enumeration value="None" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLogLevelList">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="(|Trace|Debug|Info|Warn|Error|Fatal)(,(Trace|Debug|Info|Warn|Error|Fatal))*" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="NLogInclude">
-    <xs:attribute name="file" type="SimpleLayoutAttribute" use="required">
-      <xs:annotation>
-        <xs:documentation>Name of the file to be included. You could use * wildcard. The name is relative to the name of the current config file.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="ignoreErrors" type="xs:boolean" use="optional" default="false">
-      <xs:annotation>
-        <xs:documentation>Ignore any errors in the include file.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="NLogVariable">
-    <xs:attribute name="name" type="xs:string" use="required">
-      <xs:annotation>
-        <xs:documentation>Variable name.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="value" type="SimpleLayoutAttribute" use="required">
-      <xs:annotation>
-        <xs:documentation>Variable value.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:simpleType name="NLogTargetIDList">
-    <xs:restriction base="xs:string">
-      <xs:pattern value="(|([a-zA-Z][a-zA-Z0-9_\-]*))(,([a-zA-Z][a-zA-Z0-9_\-]*))*" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="Target" abstract="true"></xs:complexType>
-  <xs:complexType name="TargetRef">
-    <xs:attribute name="name" type="xs:string" use="required" />
-  </xs:complexType>
-  <xs:complexType name="WrapperTargetBase" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="target" type="Target" minOccurs="1" maxOccurs="1" />
-          <xs:element name="wrapper-target" type="WrapperTargetBase" minOccurs="1" maxOccurs="1" />
-          <xs:element name="compound-target" type="CompoundTargetBase" minOccurs="1" maxOccurs="1" />
-          <xs:element name="target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
-          <xs:element name="wrapper-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
-          <xs:element name="compound-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
-        </xs:choice>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="CompoundTargetBase" abstract="true">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="target" type="Target" minOccurs="1" maxOccurs="unbounded" />
-          <xs:element name="wrapper-target" type="WrapperTargetBase" minOccurs="1" maxOccurs="1" />
-          <xs:element name="compound-target" type="CompoundTargetBase" minOccurs="1" maxOccurs="1" />
-          <xs:element name="target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
-          <xs:element name="wrapper-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
-          <xs:element name="compound-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
-        </xs:choice>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Filter" abstract="true"></xs:complexType>
-  <xs:complexType name="TimeSource" abstract="true"></xs:complexType>
-  <xs:simpleType name="SimpleLayoutAttribute">
-    <xs:restriction base="xs:string">
-      <xs:pattern value=".*" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="Condition">
-    <xs:restriction base="xs:string">
-      <xs:minLength value="1" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="AsyncWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="batchSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="fullBatchSizeWriteLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="overflowAction" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction" />
-          <xs:element name="queueLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="timeToSleepBetweenBatches" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="batchSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Number of log events that should be processed in a batch by the lazy writer thread.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="fullBatchSizeWriteLimit" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Limit of full s to write before yielding into  Performance is better when writing many small batches, than writing a single large batch</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="overflowAction" type="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action to be taken when the lazy writer thread request queue count exceeds the set limit.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="queueLimit" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Limit on the number of requests in the lazy writer thread request queue.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="timeToSleepBetweenBatches" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Time in milliseconds to sleep between batches.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Grow" />
-      <xs:enumeration value="Discard" />
-      <xs:enumeration value="Block" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="AutoFlushWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="condition" type="Condition">
-          <xs:annotation>
-            <xs:documentation>Condition expression. Log events who meet this condition will cause a flush on the wrapped target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="BufferingWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="bufferSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="flushTimeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="slidingTimeout" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="bufferSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Number of log events to be buffered.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="flushTimeout" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="slidingTimeout" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to use sliding timeout.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Chainsaw">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
-          <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
-          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
-          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
-          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Encoding to be used.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Instance of  that is used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="lineEnding" type="LineEndingMode">
-          <xs:annotation>
-            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxMessageSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum message size in bytes.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="newLine" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxConnections" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="connectionCacheSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="address" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Network address.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxQueueSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum queue size.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeMdc" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeSourceInfo" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeNLogData" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeCallSite" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="appInfo" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="ndcItemSeparator" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>NDC item separator.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.NetworkTargetConnectionsOverflowAction">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AllowNewConnnection" />
-      <xs:enumeration value="DiscardMessage" />
-      <xs:enumeration value="Block" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLog.Targets.NetworkTargetOverflowAction">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Error" />
-      <xs:enumeration value="Split" />
-      <xs:enumeration value="Discard" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="NLog.Targets.NLogViewerParameterInfo">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-    </xs:choice>
-    <xs:attribute name="layout" type="SimpleLayoutAttribute">
-      <xs:annotation>
-        <xs:documentation>Layout that should be use to calcuate the value for the parameter.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="name" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Viewer parameter name.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="ColoredConsole">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="useDefaultRowHighlightingRules" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="highlight-row" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.ConsoleRowHighlightingRule" />
-          <xs:element name="highlight-word" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.ConsoleWordHighlightingRule" />
-          <xs:element name="detectConsoleAvailable" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="errorStream" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Text to be rendered.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="header" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Header.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="footer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Footer.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="useDefaultRowHighlightingRules" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to use default row highlighting rules.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="detectConsoleAvailable" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to auto-check if the console is available. - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App)</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>The encoding for writing messages to the .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="errorStream" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether the error stream (stderr) should be used instead of the output stream (stdout).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.ConsoleOutputColor">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Black" />
-      <xs:enumeration value="DarkBlue" />
-      <xs:enumeration value="DarkGreen" />
-      <xs:enumeration value="DarkCyan" />
-      <xs:enumeration value="DarkRed" />
-      <xs:enumeration value="DarkMagenta" />
-      <xs:enumeration value="DarkYellow" />
-      <xs:enumeration value="Gray" />
-      <xs:enumeration value="DarkGray" />
-      <xs:enumeration value="Blue" />
-      <xs:enumeration value="Green" />
-      <xs:enumeration value="Cyan" />
-      <xs:enumeration value="Red" />
-      <xs:enumeration value="Magenta" />
-      <xs:enumeration value="Yellow" />
-      <xs:enumeration value="White" />
-      <xs:enumeration value="NoChange" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="NLog.Targets.ConsoleRowHighlightingRule">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
-      <xs:element name="backgroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
-      <xs:element name="foregroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
-    </xs:choice>
-    <xs:attribute name="condition" type="Condition">
-      <xs:annotation>
-        <xs:documentation>Condition that must be met in order to set the specified foreground and background color.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="backgroundColor" type="NLog.Targets.ConsoleOutputColor">
-      <xs:annotation>
-        <xs:documentation>Background color.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="foregroundColor" type="NLog.Targets.ConsoleOutputColor">
-      <xs:annotation>
-        <xs:documentation>Foreground color.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="NLog.Targets.ConsoleWordHighlightingRule">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-      <xs:element name="regex" minOccurs="0" maxOccurs="1" type="xs:string" />
-      <xs:element name="text" minOccurs="0" maxOccurs="1" type="xs:string" />
-      <xs:element name="wholeWords" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-      <xs:element name="compileRegex" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-      <xs:element name="backgroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
-      <xs:element name="foregroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
-    </xs:choice>
-    <xs:attribute name="ignoreCase" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Indicates whether to ignore case when comparing texts.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="regex" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Regular expression to be matched. You must specify either text or regex.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="text" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Text to be matched. You must specify either text or regex.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="wholeWords" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Indicates whether to match whole words only.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="compileRegex" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Compile the ? This can improve the performance, but at the costs of more memory usage. If false, the Regex Cache is used.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="backgroundColor" type="NLog.Targets.ConsoleOutputColor">
-      <xs:annotation>
-        <xs:documentation>Background color.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="foregroundColor" type="NLog.Targets.ConsoleOutputColor">
-      <xs:annotation>
-        <xs:documentation>Foreground color.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="Console">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="error" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="detectConsoleAvailable" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Text to be rendered.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="header" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Header.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="footer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Footer.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="error" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to send the log messages to the standard error instead of the standard output.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="detectConsoleAvailable" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to auto-check if the console is available - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App)</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>The encoding for writing messages to the .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Database">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="useTransactions" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="dbUserName" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="dbProvider" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="dbPassword" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="dbDatabase" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="connectionStringName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="connectionString" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="dbHost" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="installConnectionString" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="install-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
-          <xs:element name="uninstall-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseParameterInfo" />
-          <xs:element name="commandText" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="commandType" minOccurs="0" maxOccurs="1" type="System.Data.CommandType" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="useTransactions" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Obsolete - value will be ignored! The logging code always runs outside of transaction. Gets or sets a value indicating whether to use database transactions. Some data providers require this.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbUserName" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbProvider" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the database provider.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbPassword" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to keep the database connection open between the log events.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbDatabase" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="connectionStringName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the connection string (as specified in &lt;connectionStrings&gt; configuration section.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="connectionString" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="dbHost" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="installConnectionString" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="commandText" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Text of the SQL command to be run on each log level.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="commandType" type="System.Data.CommandType">
-          <xs:annotation>
-            <xs:documentation>Type of the SQL command to be run on each log level.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="System.Data.CommandType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Text" />
-      <xs:enumeration value="StoredProcedure" />
-      <xs:enumeration value="TableDirect" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="NLog.Targets.DatabaseCommandInfo">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="commandType" minOccurs="0" maxOccurs="1" type="System.Data.CommandType" />
-      <xs:element name="connectionString" minOccurs="0" maxOccurs="1" type="Layout" />
-      <xs:element name="ignoreFailures" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-      <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseParameterInfo" />
-      <xs:element name="text" minOccurs="0" maxOccurs="1" type="Layout" />
-    </xs:choice>
-    <xs:attribute name="commandType" type="System.Data.CommandType">
-      <xs:annotation>
-        <xs:documentation>Type of the command.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="connectionString" type="SimpleLayoutAttribute">
-      <xs:annotation>
-        <xs:documentation>Connection string to run the command against. If not provided, connection string from the target is used.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="ignoreFailures" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Indicates whether to ignore failures.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="text" type="SimpleLayoutAttribute">
-      <xs:annotation>
-        <xs:documentation>Command text.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="NLog.Targets.DatabaseParameterInfo">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-      <xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
-      <xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
-      <xs:element name="size" minOccurs="0" maxOccurs="1" type="xs:integer" />
-    </xs:choice>
-    <xs:attribute name="layout" type="SimpleLayoutAttribute">
-      <xs:annotation>
-        <xs:documentation>Layout that should be use to calcuate the value for the parameter.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="name" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Database parameter name.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="precision" type="xs:byte">
-      <xs:annotation>
-        <xs:documentation>Database parameter precision.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="scale" type="xs:byte">
-      <xs:annotation>
-        <xs:documentation>Database parameter scale.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="size" type="xs:integer">
-      <xs:annotation>
-        <xs:documentation>Database parameter size.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="Debugger">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Text to be rendered.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="header" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Header.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="footer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Footer.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Debug">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="EventLog">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="category" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="eventId" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="log" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="machineName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="source" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.EventLogTargetOverflowAction" />
-          <xs:element name="entryType" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="maxMessageLength" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="category" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout that renders event Category.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="eventId" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout that renders event ID.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="log" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the Event Log to write to. This can be System, Application or any user-defined name.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="machineName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the machine on which Event Log service is running.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="source" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Value to be used as the event Source.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="onOverflow" type="NLog.Targets.EventLogTargetOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action to take if the message is larger than the  option.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="entryType" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Optional entrytype. When not set, or when not convertable to  then determined by </xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxMessageLength" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Message length limit to write to the Event Log.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.EventLogTargetOverflowAction">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Truncate" />
-      <xs:enumeration value="Split" />
-      <xs:enumeration value="Discard" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="FallbackGroup">
-    <xs:complexContent>
-      <xs:extension base="CompoundTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="returnToFirstOnSuccess" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="returnToFirstOnSuccess" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to return to the first target after any successful write.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="File">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
-          <xs:element name="archiveNumbering" minOccurs="0" maxOccurs="1" type="NLog.Targets.ArchiveNumberingMode" />
-          <xs:element name="archiveFileName" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="archiveEvery" minOccurs="0" maxOccurs="1" type="NLog.Targets.FileArchivePeriod" />
-          <xs:element name="archiveAboveSize" minOccurs="0" maxOccurs="1" type="xs:long" />
-          <xs:element name="enableArchiveFileCompression" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="maxArchiveFiles" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="forceManaged" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="archiveFileKind" minOccurs="0" maxOccurs="1" type="NLog.Targets.FilePathKind" />
-          <xs:element name="cleanupFileName" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="discardAll" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="fileNameKind" minOccurs="0" maxOccurs="1" type="NLog.Targets.FilePathKind" />
-          <xs:element name="forceMutexConcurrentWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="writeFooterOnArchivingOnly" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="fileName" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="archiveDateFormat" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="archiveOldFileOnStartup" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="createDirs" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="enableFileDelete" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="fileAttributes" minOccurs="0" maxOccurs="1" type="NLog.Targets.Win32FileAttributes" />
-          <xs:element name="deleteOldFileOnStartup" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="replaceFileContentsOnEachWrite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="concurrentWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="keepFileOpen" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="maxLogFilenames" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="networkWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="openFileCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="openFileCacheTimeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="bufferSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="autoFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="concurrentWriteAttemptDelay" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="concurrentWriteAttempts" minOccurs="0" maxOccurs="1" type="xs:integer" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Text to be rendered.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="header" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Header.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="footer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Footer.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>File encoding.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="lineEnding" type="LineEndingMode">
-          <xs:annotation>
-            <xs:documentation>Line ending mode.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="archiveNumbering" type="NLog.Targets.ArchiveNumberingMode">
-          <xs:annotation>
-            <xs:documentation>Way file archives are numbered.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="archiveFileName" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Name of the file to be used for an archive.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="archiveEvery" type="NLog.Targets.FileArchivePeriod">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to automatically archive log files every time the specified time passes.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="archiveAboveSize" type="xs:long">
-          <xs:annotation>
-            <xs:documentation>Size in bytes above which log files will be automatically archived. Warning: combining this with  isn't supported. We cannot create multiple archive files, if they should have the same name. Choose: </xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="enableArchiveFileCompression" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to compress archive files into the zip archive format.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxArchiveFiles" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum number of archive files that should be kept.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="forceManaged" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Gets or set a value indicating whether a managed file stream is forced, instead of using the native implementation.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="archiveFileKind" type="NLog.Targets.FilePathKind">
-          <xs:annotation>
-            <xs:documentation>Is the  an absolute or relative path?</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="cleanupFileName" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Cleanup invalid values in a filename, e.g. slashes in a filename. If set to true, this can impact the performance of massive writes. If set to false, nothing gets written when the filename is wrong.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="discardAll" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="fileNameKind" type="NLog.Targets.FilePathKind">
-          <xs:annotation>
-            <xs:documentation>Is the  an absolute or relative path?</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="forceMutexConcurrentWrites" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Value indicationg whether file creation calls should be synchronized by a system global mutex.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="writeFooterOnArchivingOnly" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether the footer should be written only when the file is archived.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="fileName" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Name of the file to write to.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="archiveDateFormat" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Value specifying the date format to use when archiving files.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="archiveOldFileOnStartup" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to archive old log file on startup.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="createDirs" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to create directories if they do not exist.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="enableFileDelete" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to enable log file(s) to be deleted.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="fileAttributes" type="NLog.Targets.Win32FileAttributes">
-          <xs:annotation>
-            <xs:documentation>File attributes (Windows only).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="deleteOldFileOnStartup" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to delete old log file on startup.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="replaceFileContentsOnEachWrite" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to replace file contents on each write instead of appending log message at the end.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="concurrentWrites" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether concurrent writes to the log file by multiple processes on the same host.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="keepFileOpen" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to keep log file open instead of opening and closing it on each logging event.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxLogFilenames" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum number of log filenames that should be stored as existing.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="networkWrites" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether concurrent writes to the log file by multiple processes on different network hosts.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="openFileCacheSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="openFileCacheTimeout" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="bufferSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Log file buffer size in bytes.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="autoFlush" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to automatically flush the file buffers after each log message.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="concurrentWriteAttemptDelay" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Delay in milliseconds to wait before attempting to write to the file again.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="concurrentWriteAttempts" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Number of times the write is appended on the file before NLog discards the log message.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.ArchiveNumberingMode">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Sequence" />
-      <xs:enumeration value="Rolling" />
-      <xs:enumeration value="Date" />
-      <xs:enumeration value="DateAndSequence" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLog.Targets.FileArchivePeriod">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="None" />
-      <xs:enumeration value="Year" />
-      <xs:enumeration value="Month" />
-      <xs:enumeration value="Day" />
-      <xs:enumeration value="Hour" />
-      <xs:enumeration value="Minute" />
-      <xs:enumeration value="Sunday" />
-      <xs:enumeration value="Monday" />
-      <xs:enumeration value="Tuesday" />
-      <xs:enumeration value="Wednesday" />
-      <xs:enumeration value="Thursday" />
-      <xs:enumeration value="Friday" />
-      <xs:enumeration value="Saturday" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLog.Targets.FilePathKind">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Unknown" />
-      <xs:enumeration value="Relative" />
-      <xs:enumeration value="Absolute" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLog.Targets.Win32FileAttributes">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="ReadOnly" />
-      <xs:enumeration value="Hidden" />
-      <xs:enumeration value="System" />
-      <xs:enumeration value="Archive" />
-      <xs:enumeration value="Device" />
-      <xs:enumeration value="Normal" />
-      <xs:enumeration value="Temporary" />
-      <xs:enumeration value="SparseFile" />
-      <xs:enumeration value="ReparsePoint" />
-      <xs:enumeration value="Compressed" />
-      <xs:enumeration value="NotContentIndexed" />
-      <xs:enumeration value="Encrypted" />
-      <xs:enumeration value="WriteThrough" />
-      <xs:enumeration value="NoBuffering" />
-      <xs:enumeration value="DeleteOnClose" />
-      <xs:enumeration value="PosixSemantics" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="FilteringWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="condition" type="Condition">
-          <xs:annotation>
-            <xs:documentation>Condition expression. Log events who meet this condition will be forwarded to the wrapped target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="ImpersonatingWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="domain" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="impersonationLevel" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.SecurityImpersonationLevel" />
-          <xs:element name="logOnProvider" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.LogOnProviderType" />
-          <xs:element name="logOnType" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.SecurityLogOnType" />
-          <xs:element name="password" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="revertToSelf" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="userName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="domain" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Windows domain name to change context to.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="impersonationLevel" type="NLog.Targets.Wrappers.SecurityImpersonationLevel">
-          <xs:annotation>
-            <xs:documentation>Required impersonation level.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="logOnProvider" type="NLog.Targets.Wrappers.LogOnProviderType">
-          <xs:annotation>
-            <xs:documentation>Type of the logon provider.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="logOnType" type="NLog.Targets.Wrappers.SecurityLogOnType">
-          <xs:annotation>
-            <xs:documentation>Logon Type.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="password" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>User account password.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="revertToSelf" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to revert to the credentials of the process instead of impersonating another user.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="userName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Username to change context to.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.Wrappers.SecurityImpersonationLevel">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Anonymous" />
-      <xs:enumeration value="Identification" />
-      <xs:enumeration value="Impersonation" />
-      <xs:enumeration value="Delegation" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLog.Targets.Wrappers.LogOnProviderType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Default" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLog.Targets.Wrappers.SecurityLogOnType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Interactive" />
-      <xs:enumeration value="Network" />
-      <xs:enumeration value="Batch" />
-      <xs:enumeration value="Service" />
-      <xs:enumeration value="NetworkClearText" />
-      <xs:enumeration value="NewCredentials" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="LimitingWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="interval" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="messageLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="interval" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Interval in which messages will be written up to the  number of messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="messageLimit" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum allowed number of messages written per .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="LogReceiverService">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="endpointAddress" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="endpointConfigurationName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="useOneWayContract" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="clientId" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
-          <xs:element name="useBinaryEncoding" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="endpointAddress" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Endpoint address.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="endpointConfigurationName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the endpoint configuration in WCF configuration file.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="useOneWayContract" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to use a WCF service contract that is one way (fire and forget) or two way (request-reply)</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="clientId" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Client ID.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeEventProperties" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include per-event properties in the payload sent to the server.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="useBinaryEncoding" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to use binary message encoding.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="NLog.Targets.MethodCallParameter">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-      <xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
-      <xs:element name="type" minOccurs="0" maxOccurs="1" type="xs:string" />
-    </xs:choice>
-    <xs:attribute name="layout" type="SimpleLayoutAttribute">
-      <xs:annotation>
-        <xs:documentation>Layout that should be use to calculate the value for the parameter.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="name" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Name of the parameter.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="parameterType" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Type of the parameter.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="type" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Type of the parameter. Obsolete alias for </xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="Mail">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="html" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="addNewLines" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="cc" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="to" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="bcc" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="body" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="subject" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="from" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="timeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="priority" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="replaceNewlineWithBrTagInHtml" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="smtpServer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="smtpAuthentication" minOccurs="0" maxOccurs="1" type="NLog.Targets.SmtpAuthenticationMode" />
-          <xs:element name="smtpUserName" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="smtpPassword" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="enableSsl" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="smtpPort" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="useSystemNetMailSettings" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="pickupDirectoryLocation" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="deliveryMethod" minOccurs="0" maxOccurs="1" type="System.Net.Mail.SmtpDeliveryMethod" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Text to be rendered.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="header" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Header.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="footer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Footer.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="html" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to send message as HTML instead of plain text.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Encoding to be used for sending e-mail.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="addNewLines" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to add new lines between log entries.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="cc" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="to" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="bcc" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="body" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Mail message body (repeated for each log message send in one mail).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="subject" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Mail subject.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="from" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Sender's email address (e.g. joe@domain.com).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="timeout" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Indicates the SMTP client timeout.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="priority" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Priority used for sending mails.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="replaceNewlineWithBrTagInHtml" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether NewLine characters in the body should be replaced with  tags.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="smtpServer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>SMTP Server to be used for sending.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="smtpAuthentication" type="NLog.Targets.SmtpAuthenticationMode">
-          <xs:annotation>
-            <xs:documentation>SMTP Authentication mode.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="smtpUserName" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic").</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="smtpPassword" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic").</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="enableSsl" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="smtpPort" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Port number that SMTP Server is listening on.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="useSystemNetMailSettings" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether the default Settings from System.Net.MailSettings should be used.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="pickupDirectoryLocation" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Folder where applications save mail messages to be processed by the local SMTP server.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="deliveryMethod" type="System.Net.Mail.SmtpDeliveryMethod">
-          <xs:annotation>
-            <xs:documentation>Specifies how outgoing email messages will be handled.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.SmtpAuthenticationMode">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="None" />
-      <xs:enumeration value="Basic" />
-      <xs:enumeration value="Ntlm" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="System.Net.Mail.SmtpDeliveryMethod">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Network" />
-      <xs:enumeration value="SpecifiedPickupDirectory" />
-      <xs:enumeration value="PickupDirectoryFromIis" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="Memory">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="MSMQ">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="useXmlEncoding" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="checkIfQueueExists" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="createQueueIfNotExists" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="label" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="queue" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="recoverable" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Encoding to be used when writing text to the queue.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="useXmlEncoding" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to use the XML format when serializing message. This will also disable creating queues.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="checkIfQueueExists" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to check if a queue exists before writing to it.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="createQueueIfNotExists" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to create the queue if it doesn't exists.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="label" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Label to associate with each message.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="queue" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Name of the queue to write to.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="recoverable" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to use recoverable messages (with guaranteed delivery).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="MethodCall">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="className" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="methodName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="className" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Class name.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="methodName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Method name. The method must be public and static. Use the AssemblyQualifiedName , https://msdn.microsoft.com/en-us/library/system.type.assemblyqualifiedname(v=vs.110).aspx e.g.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Network">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
-          <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
-          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
-          <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Encoding to be used.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="lineEnding" type="LineEndingMode">
-          <xs:annotation>
-            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxMessageSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum message size in bytes.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="newLine" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="address" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Network address.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="connectionCacheSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxConnections" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxQueueSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum queue size.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="NLogViewer">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
-          <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
-          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
-          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
-          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Encoding to be used.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Instance of  that is used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="lineEnding" type="LineEndingMode">
-          <xs:annotation>
-            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxMessageSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum message size in bytes.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="newLine" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
-          <xs:annotation>
-            <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxConnections" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="keepConnection" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="connectionCacheSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="address" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Network address.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="maxQueueSize" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Maximum queue size.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeMdc" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeSourceInfo" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeNLogData" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeNdc" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeCallSite" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="appInfo" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="ndcItemSeparator" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>NDC item separator.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Null">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="formatMessage" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="formatMessage" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to perform layout calculation.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="OutputDebugString">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="PerfCounter">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="autoCreate" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="categoryName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="counterHelp" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="counterName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="counterType" minOccurs="0" maxOccurs="1" type="System.Diagnostics.PerformanceCounterType" />
-          <xs:element name="incrementValue" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="instanceName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="autoCreate" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether performance counter should be automatically created.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="categoryName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the performance counter category.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="counterHelp" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Counter help text.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="counterName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the performance counter.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="counterType" type="System.Diagnostics.PerformanceCounterType">
-          <xs:annotation>
-            <xs:documentation>Performance counter type.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="incrementValue" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>The value by which to increment the counter.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="instanceName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Performance counter instance name.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="System.Diagnostics.PerformanceCounterType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="NumberOfItems32" />
-      <xs:enumeration value="NumberOfItems64" />
-      <xs:enumeration value="NumberOfItemsHEX32" />
-      <xs:enumeration value="NumberOfItemsHEX64" />
-      <xs:enumeration value="RateOfCountsPerSecond32" />
-      <xs:enumeration value="RateOfCountsPerSecond64" />
-      <xs:enumeration value="CountPerTimeInterval32" />
-      <xs:enumeration value="CountPerTimeInterval64" />
-      <xs:enumeration value="RawFraction" />
-      <xs:enumeration value="RawBase" />
-      <xs:enumeration value="AverageTimer32" />
-      <xs:enumeration value="AverageBase" />
-      <xs:enumeration value="AverageCount64" />
-      <xs:enumeration value="SampleFraction" />
-      <xs:enumeration value="SampleCounter" />
-      <xs:enumeration value="SampleBase" />
-      <xs:enumeration value="CounterTimer" />
-      <xs:enumeration value="CounterTimerInverse" />
-      <xs:enumeration value="Timer100Ns" />
-      <xs:enumeration value="Timer100NsInverse" />
-      <xs:enumeration value="ElapsedTime" />
-      <xs:enumeration value="CounterMultiTimer" />
-      <xs:enumeration value="CounterMultiTimerInverse" />
-      <xs:enumeration value="CounterMultiTimer100Ns" />
-      <xs:enumeration value="CounterMultiTimer100NsInverse" />
-      <xs:enumeration value="CounterMultiBase" />
-      <xs:enumeration value="CounterDelta32" />
-      <xs:enumeration value="CounterDelta64" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="PostFilteringWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="defaultFilter" minOccurs="0" maxOccurs="1" type="Condition" />
-          <xs:element name="when" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.Wrappers.FilteringRule" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="defaultFilter" type="Condition">
-          <xs:annotation>
-            <xs:documentation>Default filter to be applied when no specific rule matches.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="NLog.Targets.Wrappers.FilteringRule">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="exists" minOccurs="0" maxOccurs="1" type="Condition" />
-      <xs:element name="filter" minOccurs="0" maxOccurs="1" type="Condition" />
-    </xs:choice>
-    <xs:attribute name="exists" type="Condition">
-      <xs:annotation>
-        <xs:documentation>Condition to be tested.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="filter" type="Condition">
-      <xs:annotation>
-        <xs:documentation>Resulting filter to be applied when the condition matches.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="RandomizeGroup">
-    <xs:complexContent>
-      <xs:extension base="CompoundTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="RepeatingWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="repeatCount" minOccurs="0" maxOccurs="1" type="xs:integer" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="repeatCount" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Number of times to repeat each log message.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="RetryingWrapper">
-    <xs:complexContent>
-      <xs:extension base="WrapperTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="retryCount" minOccurs="0" maxOccurs="1" type="xs:integer" />
-          <xs:element name="retryDelayMilliseconds" minOccurs="0" maxOccurs="1" type="xs:integer" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="retryCount" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Number of retries that should be attempted on the wrapped target in case of a failure.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="retryDelayMilliseconds" type="xs:integer">
-          <xs:annotation>
-            <xs:documentation>Time to wait between retries in milliseconds.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="RoundRobinGroup">
-    <xs:complexContent>
-      <xs:extension base="CompoundTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="SplitGroup">
-    <xs:complexContent>
-      <xs:extension base="CompoundTargetBase">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Trace">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout used to format log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="WebService">
-    <xs:complexContent>
-      <xs:extension base="Target">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="includeBOM" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
-          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="escapeDataNLogLegacy" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="escapeDataRfc3986" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="methodName" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="namespace" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="protocol" minOccurs="0" maxOccurs="1" type="NLog.Targets.WebServiceProtocol" />
-          <xs:element name="url" minOccurs="0" maxOccurs="1" type="xs:anyURI" />
-          <xs:element name="xmlRoot" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="xmlRootNamespace" minOccurs="0" maxOccurs="1" type="xs:string" />
-        </xs:choice>
-        <xs:attribute name="name" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the target.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeBOM" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Should we include the BOM (Byte-order-mark) for UTF? Influences the  property. This will only work for UTF-8.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="encoding" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Encoding.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="escapeDataNLogLegacy" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Value whether escaping be done according to the old NLog style (Very non-standard)</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="escapeDataRfc3986" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Value whether escaping be done according to Rfc3986 (Supports Internationalized Resource Identifiers - IRIs)</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="methodName" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Web service method name. Only used with Soap.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="namespace" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Web service namespace. Only used with Soap.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="protocol" type="NLog.Targets.WebServiceProtocol">
-          <xs:annotation>
-            <xs:documentation>Protocol to be used when calling web service.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="url" type="xs:anyURI">
-          <xs:annotation>
-            <xs:documentation>Web service URL.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="xmlRoot" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Name of the root XML element, if POST of XML document chosen. If so, this property must not be null. (see  and ).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="xmlRootNamespace" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>(optional) root namespace of the XML document, if POST of XML document chosen. (see  and ).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Targets.WebServiceProtocol">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Soap11" />
-      <xs:enumeration value="Soap12" />
-      <xs:enumeration value="HttpPost" />
-      <xs:enumeration value="HttpGet" />
-      <xs:enumeration value="JsonPost" />
-      <xs:enumeration value="XmlPost" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="CompoundLayout">
-    <xs:complexContent>
-      <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="layout" minOccurs="0" maxOccurs="unbounded" type="Layout" />
-        </xs:choice>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Layout">
-    <xs:choice minOccurs="0" maxOccurs="unbounded" />
-  </xs:complexType>
-  <xs:complexType name="CsvLayout">
-    <xs:complexContent>
-      <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="column" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.CsvColumn" />
-          <xs:element name="customColumnDelimiter" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="delimiter" minOccurs="0" maxOccurs="1" type="NLog.Layouts.CsvColumnDelimiterMode" />
-          <xs:element name="quoteChar" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="quoting" minOccurs="0" maxOccurs="1" type="NLog.Layouts.CsvQuotingMode" />
-          <xs:element name="withHeader" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="footer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Footer layout.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="header" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Header layout.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Body layout (can be repeated multiple times).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="customColumnDelimiter" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom').</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="delimiter" type="NLog.Layouts.CsvColumnDelimiterMode">
-          <xs:annotation>
-            <xs:documentation>Column delimiter.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="quoteChar" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Quote Character.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="quoting" type="NLog.Layouts.CsvQuotingMode">
-          <xs:annotation>
-            <xs:documentation>Quoting mode.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="withHeader" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether CVS should include header.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="NLog.Layouts.CsvColumnDelimiterMode">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Auto" />
-      <xs:enumeration value="Comma" />
-      <xs:enumeration value="Semicolon" />
-      <xs:enumeration value="Tab" />
-      <xs:enumeration value="Pipe" />
-      <xs:enumeration value="Space" />
-      <xs:enumeration value="Custom" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="NLog.Layouts.CsvQuotingMode">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="All" />
-      <xs:enumeration value="Nothing" />
-      <xs:enumeration value="Auto" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="NLog.Layouts.CsvColumn">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-    </xs:choice>
-    <xs:attribute name="layout" type="SimpleLayoutAttribute">
-      <xs:annotation>
-        <xs:documentation>Layout of the column.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="name" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Name of the column.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="JsonLayout">
-    <xs:complexContent>
-      <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
-          <xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-        </xs:choice>
-        <xs:attribute name="excludeProperties" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>List of property names to exclude when  is true</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="includeAllProperties" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Option to include all properties from the log events</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="renderEmptyObject" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Option to render the empty object value {}</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="suppressSpaces" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="NLog.Layouts.JsonAttribute">
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-      <xs:element name="encode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
-    </xs:choice>
-    <xs:attribute name="encode" type="xs:boolean">
-      <xs:annotation>
-        <xs:documentation>Determines wether or not this attribute will be Json encoded.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="layout" type="SimpleLayoutAttribute">
-      <xs:annotation>
-        <xs:documentation>Layout that will be rendered as the attribute's value.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-    <xs:attribute name="name" type="xs:string">
-      <xs:annotation>
-        <xs:documentation>Name of the attribute.</xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-  <xs:complexType name="LayoutWithHeaderAndFooter">
-    <xs:complexContent>
-      <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-        </xs:choice>
-        <xs:attribute name="footer" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Footer layout.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="header" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Header layout.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Body layout (can be repeated multiple times).</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="Log4JXmlEventLayout">
-    <xs:complexContent>
-      <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="SimpleLayout">
-    <xs:complexContent>
-      <xs:extension base="Layout">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="text" minOccurs="0" maxOccurs="1" type="xs:string" />
-        </xs:choice>
-        <xs:attribute name="text" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Layout text.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="when">
-    <xs:complexContent>
-      <xs:extension base="Filter">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
-          <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
-        </xs:choice>
-        <xs:attribute name="action" type="FilterResult">
-          <xs:annotation>
-            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="condition" type="Condition">
-          <xs:annotation>
-            <xs:documentation>Condition expression.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:simpleType name="FilterResult">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Neutral" />
-      <xs:enumeration value="Log" />
-      <xs:enumeration value="Ignore" />
-      <xs:enumeration value="LogFinal" />
-      <xs:enumeration value="IgnoreFinal" />
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:complexType name="whenContains">
-    <xs:complexContent>
-      <xs:extension base="Filter">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
-          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="substring" minOccurs="0" maxOccurs="1" type="xs:string" />
-        </xs:choice>
-        <xs:attribute name="action" type="FilterResult">
-          <xs:annotation>
-            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="ignoreCase" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="substring" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Substring to be matched.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="whenEqual">
-    <xs:complexContent>
-      <xs:extension base="Filter">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
-          <xs:element name="compareTo" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-        </xs:choice>
-        <xs:attribute name="action" type="FilterResult">
-          <xs:annotation>
-            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="compareTo" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>String to compare the layout to.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="ignoreCase" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="whenNotContains">
-    <xs:complexContent>
-      <xs:extension base="Filter">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
-          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-          <xs:element name="substring" minOccurs="0" maxOccurs="1" type="xs:string" />
-        </xs:choice>
-        <xs:attribute name="action" type="FilterResult">
-          <xs:annotation>
-            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="ignoreCase" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="substring" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>Substring to be matched.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="whenNotEqual">
-    <xs:complexContent>
-      <xs:extension base="Filter">
-        <xs:choice minOccurs="0" maxOccurs="unbounded">
-          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
-          <xs:element name="compareTo" minOccurs="0" maxOccurs="1" type="xs:string" />
-          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
-          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
-        </xs:choice>
-        <xs:attribute name="action" type="FilterResult">
-          <xs:annotation>
-            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="compareTo" type="xs:string">
-          <xs:annotation>
-            <xs:documentation>String to compare the layout to.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="ignoreCase" type="xs:boolean">
-          <xs:annotation>
-            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-        <xs:attribute name="layout" type="SimpleLayoutAttribute">
-          <xs:annotation>
-            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
-          </xs:annotation>
-        </xs:attribute>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="AccurateLocal">
-    <xs:complexContent>
-      <xs:extension base="TimeSource">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="AccurateUTC">
-    <xs:complexContent>
-      <xs:extension base="TimeSource">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="FastLocal">
-    <xs:complexContent>
-      <xs:extension base="TimeSource">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  <xs:complexType name="FastUTC">
-    <xs:complexContent>
-      <xs:extension base="TimeSource">
-        <xs:choice minOccurs="0" maxOccurs="unbounded" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/Properties/AssemblyInfo.cs b/TA.ArduinoPowerController.Server/Properties/AssemblyInfo.cs
index e2651f7..93e2aa6 100644
--- a/TA.ArduinoPowerController.Server/Properties/AssemblyInfo.cs
+++ b/TA.ArduinoPowerController.Server/Properties/AssemblyInfo.cs
@@ -1,11 +1,11 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
+//
 // Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
 // Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
+//
 // File: AssemblyInfo.cs  Last modified: 2017-03-16@23:33 by Tim Long
 
 using System.Reflection;
 
 [assembly: AssemblyTitle("TA.ArduinoPowerController.Server")]
-[assembly: AssemblyDescription("ASCOM multi-interface server for TA.ArduinoPowerController.Server")]
\ No newline at end of file
+[assembly: AssemblyDescription("ASCOM multi-instance server for Arduino Power Controller")]
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/Properties/Resources.Designer.cs b/TA.ArduinoPowerController.Server/Properties/Resources.Designer.cs
index 9e8fa8f..599f0ef 100644
--- a/TA.ArduinoPowerController.Server/Properties/Resources.Designer.cs
+++ b/TA.ArduinoPowerController.Server/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace TA.ArduinoPowerController.Server.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", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/TA.ArduinoPowerController.Server/Properties/Settings.Designer.cs b/TA.ArduinoPowerController.Server/Properties/Settings.Designer.cs
index 10c223e..4bcbc03 100644
--- a/TA.ArduinoPowerController.Server/Properties/Settings.Designer.cs
+++ b/TA.ArduinoPowerController.Server/Properties/Settings.Designer.cs
@@ -12,8 +12,8 @@ namespace TA.ArduinoPowerController.Server.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
-    public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
         
@@ -81,5 +81,17 @@ public string ConnectionString {
                 this["SwitchNames"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("8")]
+        public int NumberOfSwitches {
+            get {
+                return ((int)(this["NumberOfSwitches"]));
+            }
+            set {
+                this["NumberOfSwitches"] = value;
+            }
+        }
     }
 }
diff --git a/TA.ArduinoPowerController.Server/Properties/Settings.settings b/TA.ArduinoPowerController.Server/Properties/Settings.settings
index 84e8632..ae5a1e4 100644
--- a/TA.ArduinoPowerController.Server/Properties/Settings.settings
+++ b/TA.ArduinoPowerController.Server/Properties/Settings.settings
@@ -17,5 +17,8 @@
     <Setting Name="SwitchNames" Type="System.Collections.Specialized.StringCollection" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="NumberOfSwitches" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">8</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/ReadMe.md b/TA.ArduinoPowerController.Server/ReadMe.md
deleted file mode 100644
index 0ce311f..0000000
--- a/TA.ArduinoPowerController.Server/ReadMe.md
+++ /dev/null
@@ -1,21 +0,0 @@
-ASCOM Platform Components via NuGet
-===================================
-
-This repository contains a copy of the compiled binaries taken from the ASCOM Developer Components installer
-together with a `.nuspec` file for creating a NuGet package.
-
-This package can be easily installed when developing ASCOM drivers or applications and allows development
-to proceed without having to install the ASCOM Platform.
-
-This is probably of most use when using a build server, where it is burdensome to have to install ASCOM
-on each build agent.
-
-No originality is claimed, this is simply an alternative mechanism for distributing the binaries from the ASCOM Platform.
-
-This is a derivative work and the binaries are redistributed with permission, under the Creative Commons license of the ASCOM Platform.
-
-All other content is Copyright © 2016 Tigra Astronomy, all rights reserved. You may use this content under the terms of [Tigra MIT License](http://tigra.mit-license.org "MIT License for Tigra Astronomy"). 
-
-Tim Long,  
-Tigra Astronomy [http://tigra-astronomy.com](http://tigra-astronomy.com "Tigra Astronomy Web Site")  
-June 2016
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/ServedComClassLocator.cs b/TA.ArduinoPowerController.Server/ServedComClassLocator.cs
deleted file mode 100644
index f741dc0..0000000
--- a/TA.ArduinoPowerController.Server/ServedComClassLocator.cs
+++ /dev/null
@@ -1,144 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: ServedComClassLocator.cs  Last modified: 2017-03-16@23:34 by Tim Long
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using ASCOM;
-using NLog;
-
-namespace TA.ArduinoPowerController.Server
-    {
-    internal class ServedComClassLocator : MarshalByRefObject
-        {
-        private readonly ILogger Log = LogManager.GetCurrentClassLogger();
-
-        public ServedComClassLocator()
-            {
-            DiscoveredAssemblyNames = new List<string>();
-            DiscoveredTypes = new List<Type>();
-            }
-
-        /// <summary>
-        ///     Gets the list of the names of assemblies that contain ASCOM drivers to be served by
-        ///     the LocalServer.
-        /// </summary>
-        /// <value>The discovered assembly full names.</value>
-        public List<string> DiscoveredAssemblyNames { get; }
-
-        /// <summary>
-        ///     Gets the discovered types that were found to be decorated with the <see cref="ServedClassNameAttribute" />
-        ///     attribute.
-        /// </summary>
-        /// <value>A list of the discovered types.</value>
-        public List<Type> DiscoveredTypes { get; }
-
-        /// <summary>
-        ///     Discovers types (and their declaring assemblies) that are decorated with the
-        ///     <see cref="ServedClassNameAttribute" />, which identifies an ASCOM driver that should be served
-        ///     by the LocalServer.
-        /// </summary>
-        /// <remarks>
-        ///     Assemblies are loaded using <see cref="Assembly.ReflectionOnlyLoad(string)" /> to prevent any code execution.
-        ///     This would otherwise be a potential malware attack vector, since untrusted assemblies would be loaded and
-        ///     potentially into
-        ///     a privileged user context. If any of the loaded assemblies must later execute, then this operation should be
-        ///     performed
-        ///     in an isolated application domain so that the domain and all the loaded assemblies can later be unloaded. Unloaing
-        ///     an entire
-        ///     AppDomain is the only way to remove assemblies from memory.
-        ///     The class inherits from <see cref="MarshalByRefObject" /> specifically so that it can be proxied across an
-        ///     App Domain boundary.
-        /// </remarks>
-        /// <seealso cref="AppDomainIsolated{TWorker}" />
-        public void DiscoverServedClasses()
-            {
-            Log.Info("Loading served COM classes");
-
-            // put everything into one folder, the same as the server.
-            var assyPath = Assembly.GetExecutingAssembly().Location;
-            assyPath = Path.GetDirectoryName(assyPath);
-            Log.Debug($"Assembly load path is {assyPath}");
-
-            var d = new DirectoryInfo(assyPath);
-            var fileInfos = d.GetFiles("*.dll");
-            Log.Debug($"Discovered {fileInfos.Length} candidate assemblies");
-            try
-                {
-                AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve += HandleReflectionOnlyAssemblyResolve;
-                foreach (var fi in fileInfos)
-                    {
-                    Log.Trace($"Examining types in {fi.Name}");
-                    var aPath = fi.FullName;
-                    try
-                        {
-                        Log.Trace($"Attempting reflection only load for {aPath}");
-                        var so = Assembly.ReflectionOnlyLoad(Path.GetFileNameWithoutExtension(fi.Name));
-                        var soShortName = so.GetName().Name;
-                        var types = so.GetTypes();
-                        Log.Trace($"Reflection found {types.Length} types in assembly {so.FullName}");
-                        var servedClasses = from type in types.AsParallel()
-                                            let memberInfo = (MemberInfo) type
-                                            let safeAttributes = CustomAttributeData.GetCustomAttributes(memberInfo)
-                                            where safeAttributes.Any(
-                                                p => p.AttributeType.Name == nameof(ServedClassNameAttribute))
-                                            select type;
-                        var discoveredTypes = servedClasses.ToList();
-                        if (discoveredTypes.Any())
-                            {
-                            DiscoveredTypes.AddRange(discoveredTypes);
-                            DiscoveredAssemblyNames.Add(so.FullName);
-                            Log.Warn($"Discovered {discoveredTypes.Count} served clases in assembly {soShortName}");
-                            }
-                        }
-                    catch (BadImageFormatException ex)
-                        {
-                        Log.Warn(ex, $"BadImageFormat: {fi.Name}.{fi.Extension} continuing");
-                        // Probably an attempt to load a Win32 DLL (i.e. not a .net assembly)
-                        // Just swallow the exception and continue to the next item.
-                        }
-                    catch (Exception ex)
-                        {
-                        Log.Error(ex, $"Unexpected error processing {fi.Name}: {ex.Message}");
-                        //return false;
-                        }
-                    }
-                }
-            finally
-                {
-                AppDomain.CurrentDomain.ReflectionOnlyAssemblyResolve -= HandleReflectionOnlyAssemblyResolve;
-                }
-            }
-
-
-        /// <summary>
-        ///     Handles the reflection only assembly resolve.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="args">The <see cref="ResolveEventArgs" /> instance containing the event data.</param>
-        /// <returns>Assembly.</returns>
-        private Assembly HandleReflectionOnlyAssemblyResolve(object sender, ResolveEventArgs args)
-            {
-            try
-                {
-                Log.Info(
-                    $"Event: ReflectionOnlyResolveAssembly for {args.Name} requested by {args.RequestingAssembly.GetName().Name}",
-                    args.Name);
-                var resolved = Assembly.ReflectionOnlyLoad(args.Name);
-                Log.Info($"Successfully resolved assembly with {resolved.FullName}");
-                return resolved;
-                }
-            catch (FileLoadException ex)
-                {
-                Log.Error(ex, $"Failed to resolve assembly: {args.Name}");
-                return null; // Let the app raise its own error.
-                }
-            }
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/ServerStatusDisplay.Designer.cs b/TA.ArduinoPowerController.Server/ServerStatusDisplay.Designer.cs
index c8d239d..d52089b 100644
--- a/TA.ArduinoPowerController.Server/ServerStatusDisplay.Designer.cs
+++ b/TA.ArduinoPowerController.Server/ServerStatusDisplay.Designer.cs
@@ -1,3 +1,5 @@
+using TA.WinFormsControls;
+
 namespace TA.ArduinoPowerController.Server
 {
     partial class ServerStatusDisplay
@@ -32,23 +34,22 @@ private void InitializeComponent()
             this.registeredClientCount = new System.Windows.Forms.Label();
             this.OnlineClients = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
-            this.ClientStatus = new System.Windows.Forms.ListBox();
-            this.annunciatorPanel1 = new ASCOM.Controls.AnnunciatorPanel();
-            this.Relay0Annunciator = new ASCOM.Controls.Annunciator();
-            this.Relay1Annunciator = new ASCOM.Controls.Annunciator();
-            this.Relay2Annunciator = new ASCOM.Controls.Annunciator();
-            this.Relay3Annunciator = new ASCOM.Controls.Annunciator();
-            this.Relay4Annunciator = new ASCOM.Controls.Annunciator();
-            this.Relay5Annunciator = new ASCOM.Controls.Annunciator();
-            this.Relay6Annunciator = new ASCOM.Controls.Annunciator();
-            this.Relay7Annunciator = new ASCOM.Controls.Annunciator();
+            this.annunciatorPanel1 = new AnnunciatorPanel();
+            this.Relay0Annunciator = new Annunciator();
+            this.Relay1Annunciator = new Annunciator();
+            this.Relay2Annunciator = new Annunciator();
+            this.Relay3Annunciator = new Annunciator();
+            this.Relay4Annunciator = new Annunciator();
+            this.Relay5Annunciator = new Annunciator();
+            this.Relay6Annunciator = new Annunciator();
+            this.Relay7Annunciator = new Annunciator();
             this.SetupCommand = new System.Windows.Forms.Button();
             this.annunciatorPanel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
             // 
-            this.label1.Location = new System.Drawing.Point(12, 10);
+            this.label1.Location = new System.Drawing.Point(12, 38);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(104, 21);
             this.label1.TabIndex = 0;
@@ -57,7 +58,7 @@ private void InitializeComponent()
             // registeredClientCount
             // 
             this.registeredClientCount.AutoSize = true;
-            this.registeredClientCount.Location = new System.Drawing.Point(122, 10);
+            this.registeredClientCount.Location = new System.Drawing.Point(122, 38);
             this.registeredClientCount.Name = "registeredClientCount";
             this.registeredClientCount.Size = new System.Drawing.Size(13, 13);
             this.registeredClientCount.TabIndex = 1;
@@ -66,7 +67,7 @@ private void InitializeComponent()
             // OnlineClients
             // 
             this.OnlineClients.AutoSize = true;
-            this.OnlineClients.Location = new System.Drawing.Point(226, 10);
+            this.OnlineClients.Location = new System.Drawing.Point(226, 38);
             this.OnlineClients.Name = "OnlineClients";
             this.OnlineClients.Size = new System.Drawing.Size(13, 13);
             this.OnlineClients.TabIndex = 3;
@@ -74,26 +75,14 @@ private void InitializeComponent()
             // 
             // label3
             // 
-            this.label3.Location = new System.Drawing.Point(166, 10);
+            this.label3.Location = new System.Drawing.Point(166, 38);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(54, 21);
             this.label3.TabIndex = 2;
             this.label3.Text = "Online:";
             // 
-            // ClientStatus
-            // 
-            this.ClientStatus.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.ClientStatus.FormattingEnabled = true;
-            this.ClientStatus.Location = new System.Drawing.Point(13, 35);
-            this.ClientStatus.Name = "ClientStatus";
-            this.ClientStatus.Size = new System.Drawing.Size(514, 108);
-            this.ClientStatus.TabIndex = 4;
-            // 
             // annunciatorPanel1
             // 
-            this.annunciatorPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.annunciatorPanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
             this.annunciatorPanel1.Controls.Add(this.Relay0Annunciator);
             this.annunciatorPanel1.Controls.Add(this.Relay1Annunciator);
@@ -103,7 +92,7 @@ private void InitializeComponent()
             this.annunciatorPanel1.Controls.Add(this.Relay5Annunciator);
             this.annunciatorPanel1.Controls.Add(this.Relay6Annunciator);
             this.annunciatorPanel1.Controls.Add(this.Relay7Annunciator);
-            this.annunciatorPanel1.Location = new System.Drawing.Point(346, 7);
+            this.annunciatorPanel1.Location = new System.Drawing.Point(93, 14);
             this.annunciatorPanel1.Name = "annunciatorPanel1";
             this.annunciatorPanel1.Size = new System.Drawing.Size(181, 19);
             this.annunciatorPanel1.TabIndex = 5;
@@ -230,7 +219,7 @@ private void InitializeComponent()
             // 
             // SetupCommand
             // 
-            this.SetupCommand.Location = new System.Drawing.Point(265, 5);
+            this.SetupCommand.Location = new System.Drawing.Point(12, 12);
             this.SetupCommand.Name = "SetupCommand";
             this.SetupCommand.Size = new System.Drawing.Size(75, 23);
             this.SetupCommand.TabIndex = 8;
@@ -242,10 +231,11 @@ private void InitializeComponent()
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(539, 160);
+            this.AutoSize = true;
+            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.ClientSize = new System.Drawing.Size(310, 73);
             this.Controls.Add(this.SetupCommand);
             this.Controls.Add(this.annunciatorPanel1);
-            this.Controls.Add(this.ClientStatus);
             this.Controls.Add(this.OnlineClients);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.registeredClientCount);
@@ -254,6 +244,7 @@ private void InitializeComponent()
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Location = global::TA.ArduinoPowerController.Server.Properties.Settings.Default.MainFormLocation;
             this.Name = "ServerStatusDisplay";
+            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
             this.Text = "Arduino Power Controller";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
             this.Load += new System.EventHandler(this.frmMain_Load);
@@ -271,17 +262,16 @@ private void InitializeComponent()
         private System.Windows.Forms.Label registeredClientCount;
         private System.Windows.Forms.Label OnlineClients;
         private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.ListBox ClientStatus;
-        private ASCOM.Controls.AnnunciatorPanel annunciatorPanel1;
+        private AnnunciatorPanel annunciatorPanel1;
         private System.Windows.Forms.Button SetupCommand;
-        private ASCOM.Controls.Annunciator Relay0Annunciator;
-        private ASCOM.Controls.Annunciator Relay1Annunciator;
-        private ASCOM.Controls.Annunciator Relay2Annunciator;
-        private ASCOM.Controls.Annunciator Relay3Annunciator;
-        private ASCOM.Controls.Annunciator Relay4Annunciator;
-        private ASCOM.Controls.Annunciator Relay5Annunciator;
-        private ASCOM.Controls.Annunciator Relay6Annunciator;
-        private ASCOM.Controls.Annunciator Relay7Annunciator;
+        private Annunciator Relay0Annunciator;
+        private Annunciator Relay1Annunciator;
+        private Annunciator Relay2Annunciator;
+        private Annunciator Relay3Annunciator;
+        private Annunciator Relay4Annunciator;
+        private Annunciator Relay5Annunciator;
+        private Annunciator Relay6Annunciator;
+        private Annunciator Relay7Annunciator;
     }
 }
 
diff --git a/TA.ArduinoPowerController.Server/ServerStatusDisplay.cs b/TA.ArduinoPowerController.Server/ServerStatusDisplay.cs
index fe0f3fc..99827e0 100644
--- a/TA.ArduinoPowerController.Server/ServerStatusDisplay.cs
+++ b/TA.ArduinoPowerController.Server/ServerStatusDisplay.cs
@@ -12,11 +12,11 @@
 using System.Reactive.Linq;
 using System.Threading;
 using System.Windows.Forms;
-using ASCOM.Controls;
 using NLog;
 using TA.ArduinoPowerController.DeviceInterface;
 using TA.ArduinoPowerController.Server.Properties;
 using TA.Ascom.ReactiveCommunications.Diagnostics;
+using TA.WinFormsControls;
 
 namespace TA.ArduinoPowerController.Server
     {
@@ -94,19 +94,6 @@ private void ObserveClientStatusChanged(EventPattern<EventArgs> eventPattern)
             SetUiButtonState();
             SetUiDeviceConnectedState();
             var clientStatus = SharedResources.ConnectionManager.Clients;
-            try
-                {
-                ClientStatus.BeginUpdate();
-                ClientStatus.Items.Clear();
-                foreach (var client in clientStatus)
-                    {
-                    ClientStatus.Items.Add(client);
-                    }
-                }
-            finally
-                {
-                ClientStatus.EndUpdate();
-                }
             registeredClientCount.Text = clientStatus.Count().ToString();
             OnlineClients.Text = clientStatus.Count(p => p.Online).ToString();
             ConfigureUiPropertyNotifications();
diff --git a/TA.ArduinoPowerController.Server/Settings.cs b/TA.ArduinoPowerController.Server/Settings.cs
index f9b2009..f07c879 100644
--- a/TA.ArduinoPowerController.Server/Settings.cs
+++ b/TA.ArduinoPowerController.Server/Settings.cs
@@ -22,7 +22,7 @@ namespace TA.ArduinoPowerController.Server.Properties
     //  The SettingsSaving event is raised before the setting values are saved.
     [SettingsProvider(typeof(SettingsProvider))]
     [DeviceId(SharedResources.SwitchDriverId, DeviceName = SharedResources.SwitchDriverName)]
-    public sealed partial class Settings
+    internal sealed partial class Settings
         {
         private readonly ILogger log = LogManager.GetCurrentClassLogger();
 
diff --git a/TA.ArduinoPowerController.Server/SharedResources.cs b/TA.ArduinoPowerController.Server/SharedResources.cs
index 9adbe79..6df12de 100644
--- a/TA.ArduinoPowerController.Server/SharedResources.cs
+++ b/TA.ArduinoPowerController.Server/SharedResources.cs
@@ -7,9 +7,11 @@
 
 using System;
 using System.Windows.Forms;
+using Ninject;
 using NLog;
 using TA.ArduinoPowerController.DeviceInterface;
 using TA.ArduinoPowerController.Server.Properties;
+using TA.Utils.Core.Diagnostics;
 
 namespace TA.ArduinoPowerController.Server
     {
@@ -33,58 +35,47 @@ public static class SharedResources
         /// </summary>
         public const string SwitchDriverName = "Arduino Power Controller";
 
-        private static readonly ILogger Log;
+        private static readonly ILog Log = CompositionRoot.Kernel.Get<ILog>();
 
         static SharedResources()
             {
-            Log = LogManager.GetCurrentClassLogger();
-            ConnectionManager = CreateConnectionManager();
             }
 
         /// <summary>
         ///     Gets the connection manager.
         /// </summary>
         /// <value>The connection manager.</value>
-        public static ClientConnectionManager ConnectionManager { get; }
+        public static ClientConnectionManager ConnectionManager => CompositionRoot.Kernel.Get<ClientConnectionManager>();
 
-        private static ClientConnectionManager CreateConnectionManager()
-            {
-            Log.Info("Creating ClientConnectionManager");
-            return new ClientConnectionManager(
-                CreateTransactionProcessorFactory());
-            }
 
-        private static ITransactionProcessorFactory CreateTransactionProcessorFactory()
-            {
-            Log.Warn(
-                $"Creating transaction processor factory with connection string {Settings.Default.ConnectionString}");
-            return new ReactiveTransactionProcessorFactory(Settings.Default.ConnectionString ?? "(not set)");
-            }
 
         public static void DoSetupDialog(Guid clientId)
             {
             var oldConnectionString = Settings.Default.ConnectionString;
-            Log.Info($"SetupDialog requested by client {clientId}");
+            Log.Info().Message("SetupDialog requested by client {clientId}", clientId).Write();
             using (var dialogForm = new SetupDialogForm())
                 {
                 var result = dialogForm.ShowDialog();
                 switch (result)
                     {
-                        case DialogResult.OK:
-                            Log.Info($"SetupDialog successful, saving settings");
-                            Settings.Default.Save();
-                            var newConnectionString = Settings.Default.ConnectionString;
-                            if (oldConnectionString != newConnectionString)
-                                {
-                                Log.Warn(
-                                    $"Connection string has changed from {oldConnectionString} to {newConnectionString} - replacing the TansactionProcessorFactory");
-                                ConnectionManager.TransactionProcessorFactory = CreateTransactionProcessorFactory();
-                                }
-                            break;
-                        default:
-                            Log.Warn("SetupDialog cancelled or failed - reverting to previous settings");
-                            Settings.Default.Reload();
-                            break;
+                    case DialogResult.OK:
+                        Log.Info().Message("SetupDialog successful, saving settings").Write();
+                        Settings.Default.Save();
+                        var newConnectionString = Settings.Default.ConnectionString;
+                        if (oldConnectionString != newConnectionString)
+                            {
+                            Log.Warn().Message(
+                                "Connection string has changed from {old} to {new} - replacing the TansactionProcessorFactory")
+                            .Property("old", oldConnectionString)
+                            .Property("new", newConnectionString)
+                            .Write();
+                            ConnectionManager.TransactionProcessorFactory = CompositionRoot.Kernel.Get<ITransactionProcessorFactory>();
+                            }
+                        break;
+                    default:
+                        Log.Warn().Message("SetupDialog cancelled or failed - reverting to previous settings").Write();
+                        Settings.Default.Reload();
+                        break;
                     }
                 }
             }
diff --git a/TA.ArduinoPowerController.Server/TA.ArduinoPowerController.Server.csproj b/TA.ArduinoPowerController.Server/TA.ArduinoPowerController.Server.csproj
index c67384a..46c3ce5 100644
--- a/TA.ArduinoPowerController.Server/TA.ArduinoPowerController.Server.csproj
+++ b/TA.ArduinoPowerController.Server/TA.ArduinoPowerController.Server.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TA.ArduinoPowerController.Server</RootNamespace>
     <AssemblyName>TA.ArduinoPowerController.Server</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -33,13 +33,12 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <DontImportPostSharp>True</DontImportPostSharp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\BuildOutput\</OutputPath>
+    <OutputPath>..\BuildOutput\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -50,7 +49,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\BuildOutput\</OutputPath>
+    <OutputPath>..\BuildOutput\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -61,89 +60,25 @@
     <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>LocalServer.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Astrometry.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Attributes, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Attributes.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Controls, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Controls.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.DeviceInterfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.DriverAccess, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.DriverAccess.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Exceptions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Internal.Extensions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Internal.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.SettingsProvider, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.SettingsProvider.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Utilities.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Utilities.Video, Version=6.1.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Utilities.Video.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.5\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp, Version=4.3.31.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.4.3.31\lib\net35-client\PostSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Common, Version=4.3.31.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Common.4.3.31\lib\net45\PostSharp.Patterns.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Threading, Version=4.3.31.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Threading.4.3.31\lib\net45\PostSharp.Patterns.Threading.dll</HintPath>
-    </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="TA.Ascom.ReactiveCommunications, Version=0.4.6306.31345, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\TA.Ascom.ReactiveCommunications.0.4.2\lib\net45\TA.Ascom.ReactiveCommunications.dll</HintPath>
-    </Reference>
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
     <Compile Include="AboutBox.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -151,15 +86,17 @@
       <DependentUpon>AboutBox.cs</DependentUpon>
     </Compile>
     <Compile Include="AppDomainIsolated.cs" />
+    <Compile Include="AscomSwitch\Switch.cs" />
     <Compile Include="ClassFactory.cs" />
     <Compile Include="ClientConnectionManager.cs" />
-    <Compile Include="CLientStatus.cs" />
+    <Compile Include="ClientStatus.cs" />
     <Compile Include="CommunicationSettingsControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="CommunicationSettingsControl.Designer.cs">
       <DependentUpon>CommunicationSettingsControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="CompositionRoot.cs" />
     <Compile Include="GarbageCollection.cs" />
     <Compile Include="LocalServer.cs" />
     <Compile Include="NotifyPropertyChangeReactiveExtensions.cs" />
@@ -175,7 +112,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
     <Compile Include="ReferenceCountedObject.cs" />
-    <Compile Include="ServedComClassLocator.cs" />
+    <Compile Include="DriverDiscovery.cs" />
     <Compile Include="ServerStatusDisplay.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -205,34 +142,20 @@
     <Content Include="Resources\TiGra Astronomy logo 800x900.png" />
   </ItemGroup>
   <ItemGroup>
-    <AdditionalFiles Include="..\ArchitectureRules\LocalServerLayers.layerdiagram">
-      <Link>LocalServerLayers.layerdiagram</Link>
+    <AdditionalFiles Include="..\TA.ArduinoPowerController.ArchitectureValidation\Dependency Validation.layerdiagram">
+      <Link>Dependency Validation.layerdiagram</Link>
       <Visible>False</Visible>
     </AdditionalFiles>
     <None Include="app.config" />
-    <None Include="LocalServer.snk" />
     <Content Include="NLog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
       <TransformOnBuild>true</TransformOnBuild>
     </Content>
-    <None Include="NLog.Debug.config">
-      <DependentUpon>NLog.config</DependentUpon>
-      <IsTransformFile>True</IsTransformFile>
-    </None>
-    <None Include="NLog.Release.config">
-      <DependentUpon>NLog.config</DependentUpon>
-      <IsTransformFile>True</IsTransformFile>
-    </None>
-    <None Include="NLog.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="ReadMe.md" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
@@ -275,6 +198,41 @@
       <Name>TA.PostSharp.Aspects</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="ASCOM.Platform">
+      <Version>6.5.2</Version>
+    </PackageReference>
+    <PackageReference Include="GitVersion.MsBuild">
+      <Version>5.9.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="JetBrains.Annotations">
+      <Version>2021.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="Ninject">
+      <Version>3.3.4</Version>
+    </PackageReference>
+    <PackageReference Include="NLog">
+      <Version>4.7.15</Version>
+    </PackageReference>
+    <PackageReference Include="NLog.Schema">
+      <Version>4.7.15</Version>
+    </PackageReference>
+    <PackageReference Include="PostSharp">
+      <Version>6.10.8</Version>
+    </PackageReference>
+    <PackageReference Include="PostSharp.Patterns.Threading">
+      <Version>6.10.8</Version>
+    </PackageReference>
+    <PackageReference Include="TA.Utils.Logging.Nlog">
+      <Version>1.3.0</Version>
+    </PackageReference>
+    <PackageReference Include="TA.WinForms.Controls">
+      <Version>1.0.1</Version>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="..\TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.projitems" Label="Shared" />
   <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.
@@ -289,16 +247,9 @@
     <PostBuildEvent>
     </PostBuildEvent>
   </PropertyGroup>
-  <Import Project="..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets" Condition="Exists('..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets'))" />
-  </Target>
-  <Import Project="..\packages\PostSharp.4.3.31\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" />
-  <Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
-    <Error Condition="!Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://www.postsharp.net/links/nuget-restore." />
-    <Error Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Server/app.config b/TA.ArduinoPowerController.Server/app.config
index 4633a28..4f96b2a 100644
--- a/TA.ArduinoPowerController.Server/app.config
+++ b/TA.ArduinoPowerController.Server/app.config
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
-
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="TA.ArduinoPowerController.Server.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="TA.ArduinoPowerController.Server.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <userSettings>
     <TA.ArduinoPowerController.Server.Properties.Settings>
@@ -23,19 +22,26 @@
       <setting name="SetupDialogLocation" serializeAs="String">
         <value>0, 0</value>
       </setting>
+      <setting name="NumberOfSwitches" serializeAs="String">
+        <value>8</value>
+      </setting>
     </TA.ArduinoPowerController.Server.Properties.Settings>
   </userSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.31.0" newVersion="4.3.31.0" />
+        <assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.2.11.0" newVersion="6.2.11.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.2.11.0" newVersion="6.2.11.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.31.0" newVersion="4.3.31.0" />
+        <assemblyIdentity name="PostSharp.Patterns.Aggregation" publicKeyToken="e7f631e6ce13f078" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-6.2.11.0" newVersion="6.2.11.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
 
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/TA.ArduinoPowerController.Server/packages.config b/TA.ArduinoPowerController.Server/packages.config
deleted file mode 100644
index 713e855..0000000
--- a/TA.ArduinoPowerController.Server/packages.config
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ASCOM.Platform" version="6.3.0" targetFramework="net462" developmentDependency="true" />
-  <package id="DotNet.Contracts" version="1.10.20606.1" targetFramework="net462" />
-  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net462" />
-  <package id="NLog" version="4.4.5" targetFramework="net462" />
-  <package id="NLog.Schema" version="4.4.5" targetFramework="net462" />
-  <package id="PostSharp" version="4.3.31" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Common" version="4.3.31" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Threading" version="4.3.31" targetFramework="net462" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net462" />
-  <package id="SlowCheetah" version="2.5.48" targetFramework="net462" />
-  <package id="TA.Ascom.ReactiveCommunications" version="0.4.2" targetFramework="net462" />
-</packages>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Setup/AscomLocalServer.wxs b/TA.ArduinoPowerController.Setup/AscomLocalServer.wxs
index 35d3900..2d17585 100644
--- a/TA.ArduinoPowerController.Setup/AscomLocalServer.wxs
+++ b/TA.ArduinoPowerController.Setup/AscomLocalServer.wxs
@@ -7,6 +7,10 @@
       <ComponentGroupRef Id="cgNLog"/>
       <ComponentGroupRef Id="cgDeviceLayer"/>
       <ComponentGroupRef Id="cgReactiveExtensions"/>
+      <ComponentGroupRef Id="cgNinject"/>
+      <ComponentGroupRef Id="cgRuntimeSupport"/>
+      <ComponentGroupRef Id="cgTaUtils"/>
+      <ComponentGroupRef Id="cgTaWinformsControls"/>
       <Component Id="cmpAscomLocalServer" Guid="*" Win64="no">
         <File Id="filLocalServerAssembly"
               Source="$(var.Server.TargetPath)"
@@ -23,6 +27,7 @@
             <RegistryValue Value="$(var.InstallName)" Type="string"/>
             <RegistryValue Name="AppID" Value="$(var.LocalServerAppId)" Type="string"/>
             <RegistryValue Name="AuthenticationLevel" Value="1" Type="integer"/>
+            <RegistryValue Name="RunAs" Value="Interactive User" Type="string" />
           </RegistryKey>
           <!-- HKCR\AppID\{exe-name} -->
           <RegistryKey Key="$(var.Server.TargetFileName)">
diff --git a/TA.ArduinoPowerController.Setup/AscomSwitchDriver.wxs b/TA.ArduinoPowerController.Setup/AscomSwitchDriver.wxs
index 884be6d..c2b87eb 100644
--- a/TA.ArduinoPowerController.Setup/AscomSwitchDriver.wxs
+++ b/TA.ArduinoPowerController.Setup/AscomSwitchDriver.wxs
@@ -16,16 +16,11 @@
       <ComponentGroupRef Id="cgPostSharp"/>
       <ComponentGroupRef Id="cgPostSharpAspects" />
       <ComponentGroupRef Id="cgAscomLocalServer" />
+      <ComponentGroupRef Id="cgRuntimeSupport"/>
       <Component Id="cmpAscomSwitchDriver" 
                  Directory="INSTALLDIRECTORY" 
                  Guid="*" 
                  Win64="no">
-        <File Id="filSwitchDriverAssembly" 
-              Source="$(var.SwitchDriver.TargetPath)" 
-              KeyPath="yes"
-              Vital="yes" 
-              Assembly=".net"
-              AssemblyApplication="filSwitchDriverAssembly" />
         <!-- Registry entries suitable for a LocalServer served class -->
         <!-- HKCR\CLSID\{driver-guid} -->
         <RegistryKey Root="HKCR" Key="CLSID">
diff --git a/TA.ArduinoPowerController.Setup/DeviceControlLayer.wxs b/TA.ArduinoPowerController.Setup/DeviceControlLayer.wxs
index c7f5f15..8459ba6 100644
--- a/TA.ArduinoPowerController.Setup/DeviceControlLayer.wxs
+++ b/TA.ArduinoPowerController.Setup/DeviceControlLayer.wxs
@@ -7,6 +7,7 @@
       <ComponentGroupRef Id="cgReactiveAscom" />
       <ComponentGroupRef Id="cgPostSharpAspects" />
       <ComponentGroupRef Id="cgNLog" />
+      <ComponentGroupRef Id="cgRuntimeSupport"/>
       <Component Id="cmpDeviceControlLayer" Guid="*" Win64="no">
         <File Id="filDeviceLayerAssembly"
               Source="$(var.DeviceLayer.TargetPath)"
diff --git a/TA.ArduinoPowerController.Setup/JetBrainsAnnotations.wxs b/TA.ArduinoPowerController.Setup/JetBrainsAnnotations.wxs
new file mode 100644
index 0000000..934b987
--- /dev/null
+++ b/TA.ArduinoPowerController.Setup/JetBrainsAnnotations.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIRECTORY"/>
+    <ComponentGroup Id="cgJetBrains" Directory="INSTALLDIRECTORY" >
+      <Component Id="cmpJetBrainsAnnotations" Guid="*" Win64="no" >
+        <File Id="filJetBrainsAnnotations"
+              Source="$(var.Server.TargetDir)JetBrains.Annotations.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/TA.ArduinoPowerController.Setup/NLog.wxs b/TA.ArduinoPowerController.Setup/NLog.wxs
index 2a1ea80..abb1670 100644
--- a/TA.ArduinoPowerController.Setup/NLog.wxs
+++ b/TA.ArduinoPowerController.Setup/NLog.wxs
@@ -9,7 +9,6 @@
               KeyPath="yes" />
         <!-- Configuration files, non-vital as the product will work without them -->
         <File Id="filNLogConfig" Source="$(var.Server.TargetDir)NLog.config" Vital="no" />
-        <File Id="filNLogDllConfig" Source="$(var.SwitchDriver.TargetDir)NLog.dll.nlog" Vital="no" />
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/TA.ArduinoPowerController.Setup/Ninject.wxs b/TA.ArduinoPowerController.Setup/Ninject.wxs
new file mode 100644
index 0000000..7fbb952
--- /dev/null
+++ b/TA.ArduinoPowerController.Setup/Ninject.wxs
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIRECTORY"/>
+    <ComponentGroup Id="cgNinject" Directory="INSTALLDIRECTORY" >
+      <ComponentGroupRef Id="cgRuntimeSupport"/>
+      <Component Id="cmpNinjectCore" Guid="*" Win64="no" >
+        <File Id="filNinjectCore"
+              Source="$(var.Server.TargetDir)Ninject.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/TA.ArduinoPowerController.Setup/PostSharp.wxs b/TA.ArduinoPowerController.Setup/PostSharp.wxs
index 80a5a50..704fe0a 100644
--- a/TA.ArduinoPowerController.Setup/PostSharp.wxs
+++ b/TA.ArduinoPowerController.Setup/PostSharp.wxs
@@ -10,9 +10,15 @@
               KeyPath="yes" />
       </Component>
       <Component Id="cmpPostSharpPatternsCommon" Guid="*" Win64="no">
-        <File Id="filPostSharpPatternsCommon"     
-              Source="$(var.Server.TargetDir)PostSharp.Patterns.Common.dll"                         
-              Vital="yes" 
+        <File Id="filPostSharpPatternsCommon"
+              Source="$(var.Server.TargetDir)PostSharp.Patterns.Common.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>
+      <Component Id="cmpPostSharpPatternsAggregation" Guid="*" Win64="no">
+        <File Id="filPostSharpPatternsAggregation"
+              Source="$(var.Server.TargetDir)PostSharp.Patterns.Aggregation.dll"
+              Vital="yes"
               KeyPath="yes" />
       </Component>
       <Component Id="cmpPostSharpPatternsThreading"  Guid="*" Win64="no">
diff --git a/TA.ArduinoPowerController.Setup/PostSharpAspects.wxs b/TA.ArduinoPowerController.Setup/PostSharpAspects.wxs
index 630de0e..f68c4a4 100644
--- a/TA.ArduinoPowerController.Setup/PostSharpAspects.wxs
+++ b/TA.ArduinoPowerController.Setup/PostSharpAspects.wxs
@@ -5,6 +5,7 @@
     <ComponentGroup Id="cgPostSharpAspects" Directory="INSTALLDIRECTORY">
       <ComponentGroupRef Id="cgPostSharp"/>
       <ComponentGroupRef Id="cgNLog" />
+      <ComponentGroupRef Id="cgRuntimeSupport"/>
       <Component Id="cmpPostSharpAspects" Guid="*" Win64="no">
         <File Id="filPostSharpAspectsAssembly"
               Source="$(var.Aspects.TargetPath)"
diff --git a/TA.ArduinoPowerController.Setup/Product.wxs b/TA.ArduinoPowerController.Setup/Product.wxs
index a88d57b..0f70ad9 100644
--- a/TA.ArduinoPowerController.Setup/Product.wxs
+++ b/TA.ArduinoPowerController.Setup/Product.wxs
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
+
   <?include $(sys.CURRENTDIR)\Config.wxi?>
   <Product Id="*" 
            Name="$(var.InstallName)" 
@@ -7,10 +9,17 @@
            Manufacturer="$(var.Manufacturer)" 
            UpgradeCode="$(var.UpgradeCode)">
 		<Package InstallerVersion="400" Compressed="yes" InstallScope="perMachine" />
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." 
+                  AllowSameVersionUpgrades="no"/>
 		<MediaTemplate EmbedCab="yes" />
     <FeatureGroupRef Id="fgRoot"/>
 
+    <!-- Requires .NET Framework 4.8 or later --><!--
+    <PropertyRef Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" />
+    <Condition Message="This application requires .NET Framework 4.8. Please install the .NET Framework then run this installer again.">
+      <![CDATA[Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED]]>
+    </Condition>-->
+
     <!-- Launch Condition to check that x64 installer is used on x64 systems and x86 installer on x86 systems -->
     <!-- Credit to Yan Sklyarenko via Stack Overflow for suggesting this format       -->
     <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
@@ -20,5 +29,14 @@
       NOT VersionNT64
       <?endif?>
     </Condition>
+
+    <!-- Condition: Windows 7 or later -->
+    <Condition Message="This product requires Windows 7 or later">
+      <?if $(var.Win64) = "yes" ?>
+      <![CDATA[Installed OR (VersionNT64 >= 601)]]>
+      <?else?>
+      <![CDATA[Installed OR (VersionNT >= 601)]]>
+      <?endif?>
+    </Condition>
   </Product>
 </Wix>
diff --git a/TA.ArduinoPowerController.Setup/ReactiveExtensions.wxs b/TA.ArduinoPowerController.Setup/ReactiveExtensions.wxs
index 7b61d40..4c18e17 100644
--- a/TA.ArduinoPowerController.Setup/ReactiveExtensions.wxs
+++ b/TA.ArduinoPowerController.Setup/ReactiveExtensions.wxs
@@ -3,30 +3,13 @@
   <Fragment>
     <DirectoryRef Id="INSTALLDIRECTORY"/>
     <ComponentGroup Id="cgReactiveExtensions" Directory="INSTALLDIRECTORY" >
+      <ComponentGroupRef Id="cgRuntimeSupport"/>
       <Component Id="cmpReactiveCore" Guid="*" Win64="no" >
         <File Id="filReactiveCore"        
-              Source="$(var.Server.TargetDir)System.Reactive.Core.dll"              
+              Source="$(var.Server.TargetDir)System.Reactive.dll"              
               Vital="yes" 
               KeyPath="yes" />
       </Component>
-      <Component Id="cmpReactiveInterfaces" Guid="*" Win64="no" >
-        <File Id="filReactiveInterfaces"  
-              Source="$(var.Server.TargetDir)System.Reactive.Interfaces.dll"        
-              Vital="yes"
-              KeyPath="yes" />
-      </Component>
-      <Component Id="cmpReactiveLinq" Guid="*" Win64="no" >
-        <File Id="filReactiveLinq"        
-              Source="$(var.Server.TargetDir)System.Reactive.Linq.dll"              
-              Vital="yes"
-              KeyPath="yes" />
-      </Component>
-      <Component Id="cmpReactivePlatform" Guid="*" Win64="no" >
-        <File Id="filReactivePlatform"    
-              Source="$(var.Server.TargetDir)System.Reactive.PlatformServices.dll"  
-              Vital="yes"
-              KeyPath="yes" />
-      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Setup/RuntimeSupport.wxs b/TA.ArduinoPowerController.Setup/RuntimeSupport.wxs
new file mode 100644
index 0000000..745846d
--- /dev/null
+++ b/TA.ArduinoPowerController.Setup/RuntimeSupport.wxs
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIRECTORY"/>
+    <ComponentGroup Id="cgRuntimeSupport" Directory="INSTALLDIRECTORY" >
+      <ComponentGroupRef Id="cgJetBrains"/>
+      <Component Id="cmpSystemIoPorts" Guid="*" Win64="no" >
+        <File Id="filSystemIoPorts"
+              Source="$(var.Server.TargetDir)System.IO.Ports.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>
+      <Component Id="cmpSystemRuntimeCompilerServicesUnsafe" Guid="*" Win64="no" >
+        <File Id="filSystemRuntimeCompilerServicesUnsafe"
+              Source="$(var.Server.TargetDir)System.Runtime.CompilerServices.Unsafe.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>
+      <Component Id="cmpSystemTextEncodingCodePages" Guid="*" Win64="no" >
+        <File Id="filSystemTextEncodingCodePages"
+              Source="$(var.Server.TargetDir)System.Text.Encoding.CodePages.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>
+      <Component Id="cmpSystemThreadingTasksExtensions" Guid="*" Win64="no" >
+        <File Id="filSystemThreadingTasksExtensions"
+              Source="$(var.Server.TargetDir)System.Threading.Tasks.Extensions.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>
+      <!--<Component Id="cmpSystemValueTuple" Guid="*" Win64="no" >
+        <File Id="filSystemValueTuple"
+              Source="$(var.Server.TargetDir)System.ValueTuple.dll"
+              Vital="yes"
+              KeyPath="yes" />
+      </Component>-->
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/TA.ArduinoPowerController.Setup/TA.ArduinoPowerController.Setup.wixproj b/TA.ArduinoPowerController.Setup/TA.ArduinoPowerController.Setup.wixproj
index 0fdaff1..58164d2 100644
--- a/TA.ArduinoPowerController.Setup/TA.ArduinoPowerController.Setup.wixproj
+++ b/TA.ArduinoPowerController.Setup/TA.ArduinoPowerController.Setup.wixproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
+  <Import Project="..\packages\GitVersionTask.5.0.1\build\GitVersionTask.props" Condition="Exists('..\packages\GitVersionTask.5.0.1\build\GitVersionTask.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -12,10 +14,13 @@
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <OutputPath>bin\$(Configuration)-$(Platform)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)-$(Platform)\</IntermediateOutputPath>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug</DefineConstants>
     <SuppressIces>ICE69</SuppressIces>
+    <OutputPath>..\BuildOutput\$(Configuration)-$(Platform)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DefineConstants>Debug</DefineConstants>
@@ -46,14 +51,6 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
-    <ProjectReference Include="..\TA.ArduinoPowerController.Switch\TA.ArduinoPowerController.AscomSwitch.csproj">
-      <Name>SwitchDriver</Name>
-      <Project>{ed0fe6aa-e1e5-4d21-9b5e-802d50edcce1}</Project>
-      <Private>True</Private>
-      <DoNotHarvest>True</DoNotHarvest>
-      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
-      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
-    </ProjectReference>
     <ProjectReference Include="..\TA.PostSharp.Aspects\TA.PostSharp.Aspects.csproj">
       <Name>Aspects</Name>
       <Project>{9cdcf319-dadc-41eb-b787-de3862017e95}</Project>
@@ -70,18 +67,32 @@
     <Compile Include="DeviceControlLayer.wxs" />
     <Compile Include="Directories.wxs" />
     <Compile Include="FeatureTree.wxs" />
+    <Compile Include="JetBrainsAnnotations.wxs" />
+    <Compile Include="Ninject.wxs" />
     <Compile Include="NLog.wxs" />
     <Compile Include="PostSharp.wxs" />
     <Compile Include="PostSharpAspects.wxs" />
     <Compile Include="Product.wxs" />
     <Compile Include="ReactiveASCOM.wxs" />
     <Compile Include="ReactiveExtensions.wxs" />
+    <Compile Include="RuntimeSupport.wxs" />
+    <Compile Include="TaWinformsControls.wxs" />
+    <Compile Include="TaUtils.wxs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config.wxi" />
     <Content Include="packages.config" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GitVersionTask.5.0.1\build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.5.0.1\build\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.5.0.1\build\GitVersionTask.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.5.0.1\build\GitVersionTask.props'))" />
+    <Error Condition="!Exists('..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
+  </Target>
+  <Import Project="..\packages\GitVersionTask.5.0.1\build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.5.0.1\build\GitVersionTask.targets')" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
diff --git a/TA.ArduinoPowerController.Setup/TaUtils.wxs b/TA.ArduinoPowerController.Setup/TaUtils.wxs
new file mode 100644
index 0000000..4725759
--- /dev/null
+++ b/TA.ArduinoPowerController.Setup/TaUtils.wxs
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIRECTORY"/>
+    <ComponentGroup Id="cgTaUtils" Directory="INSTALLDIRECTORY">
+      <ComponentGroupRef Id="cgNLog" />
+      <ComponentGroupRef Id="cgRuntimeSupport"/>
+      <Component Id="cmpTaUtilsCore" Guid="*" Win64="no">
+        <File Id="filTaUtilsCore"
+              Source="$(var.Server.TargetDir)TA.Utils.Core.dll"
+              KeyPath="yes"
+              Vital="yes" />
+      </Component>
+      <Component Id="cmpTaUtilsLoggingNlog" Guid="*" Win64="no">
+        <File Id="filTaUtilsLoggingNlog"
+              Source="$(var.Server.TargetDir)TA.Utils.Logging.Nlog.dll"
+              KeyPath="yes"
+              Vital="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/TA.ArduinoPowerController.Setup/TaWinformsControls.wxs b/TA.ArduinoPowerController.Setup/TaWinformsControls.wxs
new file mode 100644
index 0000000..28f5ea0
--- /dev/null
+++ b/TA.ArduinoPowerController.Setup/TaWinformsControls.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIRECTORY"/>
+    <ComponentGroup Id="cgTaWinformsControls" Directory="INSTALLDIRECTORY">
+      <Component Id="cmpTaWinformsControls" Guid="*" Win64="no">
+        <File Id="filTaWinformsControls"
+              Source="$(var.Server.TargetDir)TA.WinForms.Controls.dll"
+              KeyPath="yes"
+              Vital="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/TA.ArduinoPowerController.Setup/packages.config b/TA.ArduinoPowerController.Setup/packages.config
index 1b95bba..bb86e59 100644
--- a/TA.ArduinoPowerController.Setup/packages.config
+++ b/TA.ArduinoPowerController.Setup/packages.config
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GitVersionTask" version="5.0.1" developmentDependency="true" />
   <package id="TA.Ascom.WixCustomActions" version="0.1.0-Beta15" />
+  <package id="WiX" version="3.11.2" />
 </packages>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.SharedCode/GlobalAssemblyInfo.cs b/TA.ArduinoPowerController.SharedCode/GlobalAssemblyInfo.cs
new file mode 100644
index 0000000..c26bc8d
--- /dev/null
+++ b/TA.ArduinoPowerController.SharedCode/GlobalAssemblyInfo.cs
@@ -0,0 +1,39 @@
+// This file is part of the TA.ArduinoPowerController project
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the MIT license, see http://tigra.mit-license.org/
+//
+// File: GlobalAssemblyInfo.cs  Last modified: 2017-04-07@17:48 by Tim Long
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// Global assembly attributes shared by all projects in the solution.
+
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Tigra Astronomy")]
+[assembly: AssemblyProduct("ASCOM Switch driver for Arduino Power Controller")]
+[assembly: AssemblyCopyright("Copyright © 2017-19 Tigra Astronomy")]
+[assembly: AssemblyTrademark("Tigra Astronomy")]
+[assembly: AssemblyCulture("")]
+
+/*
+ * Only classes that implement an ASCOM device interface need to be COM-Visible.
+ * The majority of types in the solution should NOT be COM-visible, so we disable
+ * COM visibility globally here. It is recommended to place [ComVisible(true)]
+ * attributes explicitly on each driver class.
+ */
+[assembly: ComVisible(false)]
+
+/*
+ Version information will be injected during the build by GitVersion.
+ If you do not wish to use GitVersion, then uninstall the GitVersionTask
+ NuGet package and add your own version information here, as follows:
+[assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyFileVersion("1.0.3")]
+[assembly: AssemblyInformationalVersion("1.0.3")]
+*/
+
+// Make internals visible to the unit test assembly.
+[assembly:InternalsVisibleTo("TA.ArduinoPowerController.Test")]
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.SharedCode/TA.ArduinoPowerController.SharedCode.projitems b/TA.ArduinoPowerController.SharedCode/TA.ArduinoPowerController.SharedCode.projitems
new file mode 100644
index 0000000..07529fc
--- /dev/null
+++ b/TA.ArduinoPowerController.SharedCode/TA.ArduinoPowerController.SharedCode.projitems
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>6778254b-a2cd-4364-bf2b-249b59285136</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>TA.ArduinoPowerController.SharedCode</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)GlobalAssemblyInfo.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.SharedCode/TA.ArduinoPowerController.SharedCode.shproj b/TA.ArduinoPowerController.SharedCode/TA.ArduinoPowerController.SharedCode.shproj
new file mode 100644
index 0000000..7eed75d
--- /dev/null
+++ b/TA.ArduinoPowerController.SharedCode/TA.ArduinoPowerController.SharedCode.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>6778254b-a2cd-4364-bf2b-249b59285136</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="TA.ArduinoPowerController.SharedCode.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.DotSettings b/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.DotSettings
deleted file mode 100644
index e7d45a2..0000000
--- a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.DotSettings
+++ /dev/null
@@ -1 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" />
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.csproj b/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.csproj
deleted file mode 100644
index d40014f..0000000
--- a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.csproj
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\PostSharp.5.0.20-preview\build\PostSharp.props" Condition="Exists('..\packages\PostSharp.5.0.20-preview\build\PostSharp.props')" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C006703F-2193-481D-AA15-F46D2FB2A21B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ASCOM.K8056.Switch.Specifications</RootNamespace>
-    <AssemblyName>ASCOM.K8056.Switch.Specifications</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <SkipPostSharp>True</SkipPostSharp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Machine.Specifications, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Machine.Specifications.0.11.0\lib\net45\Machine.Specifications.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Machine.Specifications.Should, Version=0.11.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Machine.Specifications.Should.0.11.0\lib\net45\Machine.Specifications.Should.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.3\lib\net45\NLog.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PostSharp, Version=5.0.20.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Redist.5.0.20-preview\lib\net45\PostSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Common, Version=5.0.20.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Common.Redist.5.0.20-preview\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Model, Version=5.0.20.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Model.Redist.5.0.20-preview\lib\net40\PostSharp.Patterns.Model.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Threading, Version=5.0.20.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Threading.Redist.5.0.20-preview\lib\net45\PostSharp.Patterns.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Serialization" />
-    <Reference Include="TA.Ascom.ReactiveCommunications, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\TA.Ascom.ReactiveCommunications.0.3.0\lib\net45\TA.Ascom.ReactiveCommunications.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TransactionSpecs.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\ArchitectureRules\LocalServerLayers.layerdiagram">
-      <Link>LocalServerLayers.layerdiagram</Link>
-      <Visible>False</Visible>
-    </AdditionalFiles>
-    <None Include="app.config" />
-    <None Include="ASCOM.K8056.Switch.Specifications.csproj.DotSettings" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\ASCOM.K8056.Switch\ASCOM.K8056.Switch.csproj">
-      <Project>{ed0fe6aa-e1e5-4d21-9b5e-802d50edcce1}</Project>
-      <Name>ASCOM.K8056.Switch</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\TA.VellemanK8056.DeviceInterface\TA.VellemanK8056.DeviceInterface.csproj">
-      <Project>{3015f05f-d747-4c3e-a0d4-ec2b3bd76c56}</Project>
-      <Name>TA.VellemanK8056.DeviceInterface</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.9.0\analyzers\dotnet\cs\Microsoft.DependencyValidation.Analyzers.resources.dll" />
-    <Analyzer Include="..\packages\Microsoft.DependencyValidation.Analyzers.0.9.0\analyzers\dotnet\Microsoft.DependencyValidation.Analyzers.dll" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\PostSharp.5.0.20-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.5.0.20-preview\build\PostSharp.props'))" />
-    <Error Condition="!Exists('..\packages\PostSharp.5.0.20-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.5.0.20-preview\build\PostSharp.targets'))" />
-  </Target>
-  <Import Project="..\packages\PostSharp.5.0.20-preview\build\PostSharp.targets" Condition="Exists('..\packages\PostSharp.5.0.20-preview\build\PostSharp.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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.csproj.DotSettings b/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.csproj.DotSettings
deleted file mode 100644
index 184255f..0000000
--- a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.csproj.DotSettings
+++ /dev/null
@@ -1,4 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Implicit</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/CanUseGlobalAlias/@EntryValue">False</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.v2.ncrunchproject b/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.v2.ncrunchproject
deleted file mode 100644
index 05b9746..0000000
--- a/TA.ArduinoPowerController.Switch.Specifications/ASCOM.K8056.Switch.Specifications.v2.ncrunchproject
+++ /dev/null
@@ -1,27 +0,0 @@
-<ProjectConfiguration>
-  <AutoDetectNugetBuildDependencies>true</AutoDetectNugetBuildDependencies>
-  <BuildPriority>1000</BuildPriority>
-  <CopyReferencedAssembliesToWorkspace>false</CopyReferencedAssembliesToWorkspace>
-  <ConsiderInconclusiveTestsAsPassing>false</ConsiderInconclusiveTestsAsPassing>
-  <PreloadReferencedAssemblies>false</PreloadReferencedAssemblies>
-  <AllowDynamicCodeContractChecking>true</AllowDynamicCodeContractChecking>
-  <AllowStaticCodeContractChecking>false</AllowStaticCodeContractChecking>
-  <AllowCodeAnalysis>false</AllowCodeAnalysis>
-  <IgnoreThisComponentCompletely>false</IgnoreThisComponentCompletely>
-  <RunPreBuildEvents>false</RunPreBuildEvents>
-  <RunPostBuildEvents>false</RunPostBuildEvents>
-  <PreviouslyBuiltSuccessfully>true</PreviouslyBuiltSuccessfully>
-  <TrackFileDependencies>false</TrackFileDependencies>
-  <InstrumentAssembly>true</InstrumentAssembly>
-  <PreventSigningOfAssembly>false</PreventSigningOfAssembly>
-  <AnalyseExecutionTimes>true</AnalyseExecutionTimes>
-  <DetectStackOverflow>true</DetectStackOverflow>
-  <IncludeStaticReferencesInWorkspace>true</IncludeStaticReferencesInWorkspace>
-  <DefaultTestTimeout>60000</DefaultTestTimeout>
-  <UseBuildConfiguration />
-  <UseBuildPlatform />
-  <ProxyProcessPath />
-  <UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
-  <MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
-  <BuildProcessArchitecture>x86</BuildProcessArchitecture>
-</ProjectConfiguration>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch.Specifications/TransactionSpecs.cs b/TA.ArduinoPowerController.Switch.Specifications/TransactionSpecs.cs
deleted file mode 100644
index f282df8..0000000
--- a/TA.ArduinoPowerController.Switch.Specifications/TransactionSpecs.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-// This file is part of the ASCOM.K8056.Switch project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: TransactionSpecs.cs  Last modified: 2017-03-06@19:17 by Tim Long
-
-using System.Collections.Generic;
-using Machine.Specifications;
-using TA.VellemanK8056.DeviceInterface;
-
-namespace ASCOM.K8056.Switch.Specifications
-    {
-    [Subject(typeof(NoReplyTransaction))]
-    public class when_computing_a_twos_compliment_checksum_of_bytes
-        {
-        static byte actualChecksum;
-        static byte expectedChecksum;
-        static List<byte> input;
-        Establish context = () =>
-            {
-            input = new List<byte> {0x0A, 0xAE, 0x00, 0x00, 0x46, 0x31, 0x30, 0x00, 0x41, 0x44, 0x43, 0x00, 0x00};
-            expectedChecksum = 0xD9;
-            };
-        Because of = () => actualChecksum = NoReplyTransaction.ComputeChecksum(input);
-        It should_give_the_expected_checksum = () => actualChecksum.ShouldEqual(expectedChecksum);
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch.Specifications/app.config b/TA.ArduinoPowerController.Switch.Specifications/app.config
deleted file mode 100644
index d48b4ff..0000000
--- a/TA.ArduinoPowerController.Switch.Specifications/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch.Specifications/packages.config b/TA.ArduinoPowerController.Switch.Specifications/packages.config
deleted file mode 100644
index c5745d5..0000000
--- a/TA.ArduinoPowerController.Switch.Specifications/packages.config
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Machine.Specifications" version="0.11.0" targetFramework="net462" />
-  <package id="Machine.Specifications.Should" version="0.11.0" targetFramework="net462" />
-  <package id="Microsoft.DependencyValidation.Analyzers" version="0.9.0" targetFramework="net462" />
-  <package id="NLog" version="4.4.3" targetFramework="net462" />
-  <package id="PostSharp" version="5.0.20-preview" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Common" version="5.0.20-preview" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Common.Redist" version="5.0.20-preview" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Model" version="5.0.20-preview" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Model.Redist" version="5.0.20-preview" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Threading" version="5.0.20-preview" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Threading.Redist" version="5.0.20-preview" targetFramework="net462" />
-  <package id="PostSharp.Redist" version="5.0.20-preview" targetFramework="net462" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net462" />
-  <package id="System.Xml.XmlSerializer" version="4.0.11" targetFramework="net462" />
-  <package id="TA.Ascom.ReactiveCommunications" version="0.3.0" targetFramework="net462" />
-</packages>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/AscomDriverAssemblyResolver.cs b/TA.ArduinoPowerController.Switch/AscomDriverAssemblyResolver.cs
deleted file mode 100644
index 7f611be..0000000
--- a/TA.ArduinoPowerController.Switch/AscomDriverAssemblyResolver.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: AscomDriverAssemblyResolver.cs  Last modified: 2017-03-17@17:36 by Tim Long
-
-using System;
-using System.IO;
-using System.Reflection;
-using NLog;
-
-namespace TA.ArduinoPowerController.AscomSwitch
-    {
-    internal static class AscomDriverAssemblyResolver
-        {
-        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
-
-        /// <summary>
-        ///     Resolves support assemblies for an ASCOM driver by searching in the same directory
-        ///     as the driver assembly.
-        /// </summary>
-        /// <param name="sender">The sender.</param>
-        /// <param name="args">
-        ///     The <see cref="ResolveEventArgs" /> instance containing the event data.
-        /// </param>
-        /// <returns>The loaded resolved assembly.</returns>
-        /// <remarks>
-        ///     <para>
-        ///         The CLR's default assembly resolution strategy is to look in the Global Assembly Cache,
-        ///         then in the application directory and subfolders. However, an ASCOM driver is loaded
-        ///         via COM Interop and is not normally located in the application directory, so the runtime
-        ///         will need help locating an referenced assemblies.
-        ///     </para>
-        ///     <para>
-        ///         By default, ASCOM solves this by including the CodeBase registry value in the driver's
-        ///         COM Interop registration. This requires that the driver is strong named, which means that
-        ///         any referenced assemblies also have to be strong named. This can be problematic, especially
-        ///         if the driver uses third party code that is not signed.
-        ///     </para>
-        ///     <para>
-        ///         Tigra Astronomy prefers to use a custom assembly resolver, which simply looks in the same
-        ///         directory as the driver assembly. This avoids the need to sign the driver with a strong-name,
-        ///         which gives us a bit more flexibility in using third party libraries and tends to simplify
-        ///         build, debug and deployment.
-        ///     </para>
-        /// </remarks>
-        public static Assembly ResolveSupportAssemblies(object sender, ResolveEventArgs args)
-            {
-            try
-                {
-                Log.Info($"Handling AppDomain.ResolveAssembly event for {args.Name}");
-                Log.Info("Attempting to resolve the assembly");
-                var me = Assembly.GetExecutingAssembly();
-                var here = me.Location;
-                var myDirectory = Path.GetDirectoryName(here);
-                var commaPosition = args.Name.IndexOf(',');
-                var targetName = args.Name.Head(commaPosition);
-                var targetDll = targetName + ".dll";
-                var target = Path.Combine(myDirectory, targetDll);
-                Log.Info($"Target assembly is {target}");
-                var resolvedAssembly = Assembly.LoadFrom(target);
-                Log.Info($"Successfully resolved assembly load with {resolvedAssembly.GetName()}");
-                return resolvedAssembly;
-                }
-            catch (Exception ex)
-                {
-                Log.Error(ex, $"Failed to resolve assembly: {args.Name}");
-                return null; // Let the app raise its own error.
-                }
-            }
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/NLog.dll.Debug.nlog b/TA.ArduinoPowerController.Switch/NLog.dll.Debug.nlog
deleted file mode 100644
index f2aa0df..0000000
--- a/TA.ArduinoPowerController.Switch/NLog.dll.Debug.nlog
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- For more information on using transformations 
-     see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
-<nlog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-      xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" 
-      xmlns="http://www.nlog-project.org/schemas/NLog.xsd">
-  <rules xdt:Transform="Replace">
-    <logger name="*" minlevel="Trace" writeTo="DebugView" />
-    <logger name="*" minlevel="Debug" writeTo="LogFile" />
-  </rules>
-</nlog>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/NLog.dll.Release.nlog b/TA.ArduinoPowerController.Switch/NLog.dll.Release.nlog
deleted file mode 100644
index db7ce87..0000000
--- a/TA.ArduinoPowerController.Switch/NLog.dll.Release.nlog
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- For more information on using transformations 
-     see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
-<nlog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform" xmlns="http://www.nlog-project.org/schemas/NLog.xsd">
-  <rules xdt:Transform="Replace">
-    <logger name="*" minlevel="Info" writeTo="DebugView" />
-    <logger name="*" minlevel="Warn" writeTo="LogFile" />
-  </rules>
-</nlog>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/NLog.dll.nlog b/TA.ArduinoPowerController.Switch/NLog.dll.nlog
deleted file mode 100644
index 1949941..0000000
--- a/TA.ArduinoPowerController.Switch/NLog.dll.nlog
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true">
-
-  <!-- 
-  See https://github.com/nlog/nlog/wiki/Configuration-file 
-  for information on customizing logging rules and outputs.
-   -->
-  <targets async="true">
-    <target xsi:type="Trace" name="DebugView"
-            layout="${time}|${pad:padding=-5:inner=${uppercase:${level}}}|${pad:padding=-16:inner=${callsite:className=true:fileName=false:includeSourcePath=false:methodName=false:includeNamespace=false}}|${message}" />
-    <target xsi:type="File" name="LogFile"
-            filename="${environment:variable=UserProfile}/logs/ASCOM.ArduinoPowrController.Server-${filesystem-normalize:fSNormalize=true:inner=${shortdate}-${windows-identity}-${machinename}.log}"
-            layout="${time}|${pad:padding=-5:inner=${uppercase:${level}}}|${pad:padding=-16:inner=${callsite:className=true:fileName=false:includeSourcePath=false:methodName=false:includeNamespace=false}}|${message}" />
-  </targets>
-  <rules>
-    <logger name="*" minlevel="Warn" writeTo="DebugView" />
-    <logger name="*" minlevel="Warn" writeTo="LogFile" />
-  </rules>
-</nlog>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/Octet.cs b/TA.ArduinoPowerController.Switch/Octet.cs
deleted file mode 100644
index e611c18..0000000
--- a/TA.ArduinoPowerController.Switch/Octet.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: Octet.cs  Last modified: 2017-04-02@18:44 by Tim Long
-
-using System;
-using System.Diagnostics.Contracts;
-using System.Text;
-using PostSharp.Patterns.Contracts;
-
-namespace TA.ArduinoPowerController.AscomSwitch
-    {
-    /// <summary>
-    ///     An immutable representation of an 8 bit byte, with each bit individually addressable. In
-    ///     most cases an Octet is interchangeable with a <see cref="byte" /> (implicit conversion
-    ///     operators are provided). An Octet can be explicitly converted (cast) to or from an
-    ///     integer.
-    /// </summary>
-    public struct Octet : IEquatable<Octet>
-        {
-        private readonly bool[] bits;
-
-        [ContractInvariantMethod]
-        private void ObjectInvariant()
-            {
-            Contract.Invariant(bits != null);
-            Contract.Invariant(bits.Length == 8, "Consider using Octet.FromInt() instead of new Octet()");
-            }
-
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="Octet" /> struct from an array of at least 8 booleans.
-        /// </summary>
-        /// <param name="bits">The bits; there must be exactly 8.</param>
-        private Octet([Required] bool[] bits)
-            {
-            Contract.Requires(bits != null);
-            Contract.Requires(bits.Length == 8);
-            this.bits = bits;
-            }
-
-        /// <summary>
-        ///     Gets an Octet with all the bits set to zero.
-        /// </summary>
-        public static Octet Zero { get; } = FromInt(0);
-
-        /// <summary>
-        ///     Gets an Octet set to the maximum value (i.e. all the bits set to one).
-        /// </summary>
-        public static Octet Max { get; } = FromInt(0xFF);
-
-        public bool this[int bit]
-            {
-            get
-                {
-                Contract.Requires(bit >= 0 && bit < 8);
-                return bits[bit];
-                }
-            }
-
-        /// <summary>
-        ///     Factory method: create an Octet from an integer.
-        /// </summary>
-        /// <param name="source">The source.</param>
-        /// <returns>Octet.</returns>
-        public static Octet FromInt(int source)
-            {
-            var bits = new bool[8];
-            for (var i = 0; i < 8; i++)
-                {
-                var bit = source & 0x01;
-                bits[i] = bit != 0;
-                source >>= 1;
-                }
-            return new Octet(bits);
-            }
-
-        /// <summary>
-        ///     Factory method: create an Octet from an unisgned integer.
-        /// </summary>
-        /// <param name="source">The source.</param>
-        /// <returns>Octet.</returns>
-        public static Octet FromUnsignedInt(uint source)
-            {
-            return FromInt((int) source);
-            }
-
-        /// <summary>
-        ///     Returns a new octet with the specified bit number set to the specified value.
-        ///     Other bits are duplicated.
-        /// </summary>
-        /// <param name="bit">The bit number to be modified.</param>
-        /// <param name="value">The value of the specified bit number.</param>
-        /// <returns>A new octet instance with the specified bit number set to the specified value.</returns>
-        public Octet WithBitSetTo(ushort bit, bool value)
-            {
-            Contract.Requires(bit < 8);
-            var newBits = new bool[8];
-            bits.CopyTo(newBits, 0);
-            newBits[bit] = value;
-            return new Octet(newBits);
-            }
-
-        /// <summary>
-        ///     Returns a new octet with the specified bit number set to the specified value.
-        ///     Other bits are duplicated.
-        /// </summary>
-        /// <param name="bit">The bit number to be modified.</param>
-        /// <param name="value">The value of the specified bit number.</param>
-        /// <returns>A new octet instance with the specified bit number set to the specified value.</returns>
-        public Octet WithBitSetTo(int bit, bool value)
-            {
-            Contract.Requires(bit >= 0 && bit < 8);
-            return WithBitSetTo((ushort) bit, value);
-            }
-
-        public override string ToString()
-            {
-            var builder = new StringBuilder();
-            for (var i = 7; i >= 0; i--)
-                {
-                builder.Append(bits[i] ? '1' : '0');
-                builder.Append(' ');
-                }
-            builder.Length -= 1;
-            return builder.ToString();
-            }
-
-        /// <summary>
-        ///     Performs an explicit conversion from <see cref="uint" /> to <see cref="Octet" />.
-        ///     This conversion is explicit because there is potential loss of information.
-        /// </summary>
-        /// <param name="integer">The integer.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Octet(uint integer)
-            {
-            return FromUnsignedInt(integer);
-            }
-
-        /// <summary>
-        ///     Performs an explicit conversion from <see cref="int" /> to <see cref="Octet" />.
-        ///     This conversion is explicit because there is potential loss of information.
-        /// </summary>
-        /// <param name="integer">The integer.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static explicit operator Octet(int integer)
-            {
-            return FromInt(integer);
-            }
-
-        /// <summary>
-        ///     Performs an implicit conversion from <see cref="Octet" /> to <see cref="byte" />.
-        /// </summary>
-        /// <param name="octet">The octet.</param>
-        /// <returns>The result of the conversion.</returns>
-        public static implicit operator byte(Octet octet)
-            {
-            var sum = 0;
-            for (var i = 0; i < 8; i++)
-                {
-                if (octet[i]) sum += 1 << i;
-                }
-            return (byte) sum;
-            }
-
-        /// <summary>
-        ///     Performs an implicit conversion from <see cref="byte" /> to <see cref="Octet" />.
-        /// </summary>
-        /// <param name="b">The input byte.</param>
-        /// <returns>The result of the conversion in a new Octet.</returns>
-        public static implicit operator Octet(byte b)
-            {
-            return FromUnsignedInt(b);
-            }
-
-        /// <summary>
-        ///     Indicates whether this octet is equal to another octet, using value semantics.
-        /// </summary>
-        /// <returns>
-        ///     true if the current object is equal to the <paramref name="other" /> parameter; otherwise, false.
-        /// </returns>
-        /// <param name="other">An object to compare with this object.</param>
-        public bool Equals(Octet other)
-            {
-            for (var i = 0; i < bits.Length; i++)
-                {
-                if (bits[i] != other[i]) return false;
-                }
-            return true;
-            }
-
-        public override bool Equals(object obj)
-            {
-            if (ReferenceEquals(null, obj)) return false;
-            return obj is Octet && Equals((Octet) obj);
-            }
-
-        public override int GetHashCode()
-            {
-            return bits.GetHashCode();
-            }
-
-        public static bool operator ==(Octet left, Octet right)
-            {
-            return left.Equals(right);
-            }
-
-        public static bool operator !=(Octet left, Octet right)
-            {
-            return !left.Equals(right);
-            }
-
-        public static Octet operator &(Octet left, Octet right)
-            {
-            var result = (bool[]) left.bits.Clone();
-            for (var i = 0; i < 8; i++)
-                {
-                result[i] &= right[i];
-                }
-            return new Octet(result);
-            }
-
-        public static Octet operator |(Octet left, Octet right)
-            {
-            var result = (bool[]) left.bits.Clone();
-            for (var i = 0; i < 8; i++)
-                {
-                result[i] |= right[i];
-                }
-            return new Octet(result);
-            }
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/Properties/AssemblyInfo.cs b/TA.ArduinoPowerController.Switch/Properties/AssemblyInfo.cs
deleted file mode 100644
index b9ce97f..0000000
--- a/TA.ArduinoPowerController.Switch/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: AssemblyInfo.cs  Last modified: 2017-04-02@18:44 by Tim Long
-
-using System.Reflection;
-
-[assembly: AssemblyTitle("ASCOM.ArduinoPowerController.Switch")]
-[assembly: AssemblyDescription("ASCOM Switch Driver for Arduino Power Controller")]
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/Scripts/LoadSwitch.ps1 b/TA.ArduinoPowerController.Switch/Scripts/LoadSwitch.ps1
deleted file mode 100644
index 0e1a13f..0000000
--- a/TA.ArduinoPowerController.Switch/Scripts/LoadSwitch.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-Push-Location ..\bin\Debug
-Add-Type -path .\ASCOM.ArduinoPowerController.Switch.dll
-$global:sw=New-Object ASCOM.ArduinoPowerController.Switch
-$global:sw.Connected = $true
-Pop-Location
diff --git a/TA.ArduinoPowerController.Switch/Scripts/WalkingRelayTest.ps1 b/TA.ArduinoPowerController.Switch/Scripts/WalkingRelayTest.ps1
deleted file mode 100644
index f64f918..0000000
--- a/TA.ArduinoPowerController.Switch/Scripts/WalkingRelayTest.ps1
+++ /dev/null
@@ -1,19 +0,0 @@
-
-$sw = New-Object -ComObject  ASCOM.ArduinoPowerController.Switch
-$sw.Connected = $true
-
-Function WalkState([bool] $state)
-    {
-    For ($i=0; $i -lt 8; $i++)
-        {
-        $sw.SetSwitch($i, $state)
-        Start-Sleep -Milliseconds 250
-        }
-    }
-
-While ($true)
-	{
-	WalkState($true)
-	WalkState($false)
-	}
-
diff --git a/TA.ArduinoPowerController.Switch/StringExtensions.cs b/TA.ArduinoPowerController.Switch/StringExtensions.cs
deleted file mode 100644
index 102e609..0000000
--- a/TA.ArduinoPowerController.Switch/StringExtensions.cs
+++ /dev/null
@@ -1,272 +0,0 @@
-// This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: StringExtensions.cs  Last modified: 2017-03-17@17:37 by Tim Long
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.Contracts;
-using System.Linq;
-using System.Text;
-
-namespace TA.ArduinoPowerController.AscomSwitch
-    {
-    public static class StringExtensions
-        {
-        private static readonly string[] AsciiEncoding =
-            {
-            "", "", "", "", "", "", "", "\a", "\b", "\t", "\n", "\v", "\f",
-            "\r", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", " ", "!", "\"", "#", "$", "%",
-            "&", "\'", "(", ")", "*", "+", ",", "-", ".", "/", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ":",
-            ";", "<", "=", ">", "?", "@", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P",
-            "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "[", "\\", "]", "^", "_", "`", "a", "b", "c", "d", "e",
-            "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "{",
-            "|", "}", "~", ""
-            };
-
-        private static readonly IDictionary<int, string> asciiMnemonics = new Dictionary<int, string>
-            {
-                {0x00, "<NULL>"},
-                {0x01, "<SOH>"},
-                {0x02, "<STH>"},
-                {0x03, "<ETX>"},
-                {0x04, "<EOT>"},
-                {0x05, "<ENQ>"},
-                {0x06, "<ACK>"},
-                {0x07, "<BELL>"},
-                {0x08, "<BS>"},
-                {0x09, "<HT>"},
-                {0x0A, "<LF>"},
-                {0x0B, "<VT>"},
-                {0x0C, "<FF>"},
-                {0x0D, "<CR>"},
-                {0x0E, "<SO>"},
-                {0x0F, "<SI>"},
-                {0x11, "<DC1>"},
-                {0x12, "<DC2>"},
-                {0x13, "<DC3>"},
-                {0x14, "<DC4>"},
-                {0x15, "<NAK>"},
-                {0x16, "<SYN>"},
-                {0x17, "<ETB>"},
-                {0x18, "<CAN>"},
-                {0x19, "<EM>"},
-                {0x1A, "<SUB>"},
-                {0x1B, "<ESC>"},
-                {0x1C, "<FS>"},
-                {0x1D, "<GS>"},
-                {0x1E, "<RS>"},
-                {0x1F, "<US>"},
-            //{ 0x20, "<SP>" },
-                {0x7F, "<DEL>"}
-            };
-
-        public static bool CaseInsensitiveEquals(this string lhs, string rhs)
-            {
-            Contract.Requires(lhs != null);
-            Contract.Requires(rhs != null);
-            return string.Equals(lhs.ToLower(), rhs.ToLower());
-            }
-
-        /// <summary>
-        ///     Removes all unwanted characters from a string.
-        /// </summary>
-        /// <param name="source">The source string.</param>
-        /// <param name="clean">A list of the unwanted characters. All other characters will be preserved.</param>
-        /// <returns>
-        ///     A new string with all of the unwanted characters deleted. Returns <see cref="string.Empty" />
-        ///     if all of the characters were deleted or if the source string was null or empty.
-        /// </returns>
-        /// <remarks>
-        ///     Contrast with <see cref="Keep" />
-        /// </remarks>
-        /// <seealso cref="Keep" />
-        public static string Clean(this string source, string clean)
-            {
-            if (string.IsNullOrEmpty(source))
-                return string.Empty;
-            var cleanString = new StringBuilder(source.Length);
-            foreach (var ch in source)
-                {
-                if (!clean.Contains(ch))
-                    cleanString.Append(ch);
-                }
-            return cleanString.ToString();
-            }
-
-        public static bool Contains(this string s, string value)
-            {
-            Contract.Requires(s != null);
-            Contract.Requires(value != null);
-            return s.IndexOf(value) >= 0;
-            }
-
-        public static bool EndsWith(this string s, string value)
-            {
-            Contract.Requires(s != null);
-            Contract.Requires(value != null);
-            return s.IndexOf(value) == s.Length - value.Length;
-            }
-
-        /// <summary>
-        ///     Utility function. Expands non-printable ASCII characters into mnemonic human-readable form.
-        /// </summary>
-        /// <returns>
-        ///     Returns a new string with non-printing characters replaced by human-readable mnemonics.
-        /// </returns>
-        public static string ExpandASCII(this string inputString)
-            {
-            Contract.Requires(inputString != null);
-            Contract.Ensures(Contract.Result<string>() != null);
-            var expanded = new StringBuilder(inputString.Length);
-            foreach (var c in inputString)
-                expanded.Append(c.ExpandASCII());
-            return expanded.ToString();
-            }
-
-        /// <summary>
-        ///     Utility function. Expands non-printable ASCII characters into mnemonic human-readable form.
-        ///     printable characters are returned unmodified.
-        /// </summary>
-        /// <param name="c">The c.</param>
-        /// <returns>
-        ///     If the original character is a non-printing ASCII character, then returns a string containing a
-        ///     human-readable mnemonic for that ASCII character,
-        ///     <example>
-        ///         0x07 returns &lt;BELL&gt;
-        ///     </example>
-        ///     .
-        ///     Otherwise, returns the original character converted to a string.
-        /// </returns>
-        public static string ExpandASCII(this char c)
-            {
-            Contract.Ensures(Contract.Result<string>() != null);
-            int asciiCode = c;
-            return asciiMnemonics.ContainsKey(asciiCode) ? asciiMnemonics[asciiCode] : c.ToString();
-            }
-
-        public static string GetString(this byte[] bytes)
-            {
-            Contract.Requires(bytes != null);
-            Contract.Ensures(Contract.Result<string>() != null);
-            var builder = new StringBuilder(bytes.Length);
-            for (var i = 0; i < bytes.Length; i++)
-                builder.Append(AsciiEncoding[bytes[i] & 0x7F]);
-            return builder.ToString();
-            }
-
-        /// <summary>
-        ///     Returns the specified number of characters from the head of a string.
-        /// </summary>
-        /// <param name="source">The source string.</param>
-        /// <param name="length">The number of characters to be returned, must not be greater than the length of the string.</param>
-        /// <returns>The specified number of characters from the head of the source string, as a new string.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if the requested number of characters exceeds the string length.</exception>
-        public static string Head(this string source, int length)
-            {
-            if (length > source.Length)
-                {
-                throw new ArgumentOutOfRangeException("source",
-                    "The specified length is greater than the length of the string.");
-                }
-            return source.Substring(0, length);
-            }
-
-        /// <summary>
-        ///     Keeps only the wanted (that is, removes all unwanted characters) from the string.
-        /// </summary>
-        /// <param name="source">The source string.</param>
-        /// <param name="keep">A list of the wanted characters. All other characters will be removed.</param>
-        /// <returns>
-        ///     A new string with all of the unwanted characters deleted. Returns <see cref="string.Empty" /> if all
-        ///     the characters were deleted or if the source string was null or empty.
-        /// </returns>
-        /// <seealso cref="Clean" />
-        public static string Keep(this string source, string keep)
-            {
-            if (string.IsNullOrEmpty(source))
-                return string.Empty;
-            var cleanString = new StringBuilder(source.Length);
-            foreach (var ch in source)
-                {
-                if (keep.Contains(ch))
-                    cleanString.Append(ch);
-                }
-            return cleanString.ToString();
-            }
-
-        /// <summary>
-        ///     Remove the head of the string, leaving the tail.
-        /// </summary>
-        /// <param name="source">The source string.</param>
-        /// <param name="length">Number of characters to remove from the head.</param>
-        /// <returns>A new string containing the old string with <paramref name="length" /> characters removed from the head.</returns>
-        public static string RemoveHead(this string source, int length)
-            {
-            if (length < 1)
-                return source;
-            return source.Tail(source.Length - length);
-            }
-
-        /// <summary>
-        ///     Remove the tail of the string, leaving the head.
-        /// </summary>
-        /// <param name="source">The source string.</param>
-        /// <param name="length">Number of characters to remove from the tail.</param>
-        /// <returns>A new string containing the old string with <paramref name="length" /> characters removed from the tail.</returns>
-        public static string RemoveTail(this string source, int length)
-            {
-            if (length < 1)
-                return source;
-            return source.Head(source.Length - length);
-            }
-
-        public static bool StartsWith(this string s, string value)
-            {
-            Contract.Requires(s != null);
-            Contract.Requires(value != null);
-            return s.IndexOf(value) == 0;
-            }
-
-        /// <summary>
-        ///     Returns the specified number of characters from the tail of a string.
-        /// </summary>
-        /// <param name="source">The source string.</param>
-        /// <param name="length">The number of characters to be returned, must not be greater than the length of the string.</param>
-        /// <returns>The specified number of characters from the tail of the source string, as a new string.</returns>
-        /// <exception cref="ArgumentOutOfRangeException">Thrown if the requested number of characters exceeds the string length.</exception>
-        public static string Tail(this string source, int length)
-            {
-            var srcLength = source.Length;
-            if (length > srcLength)
-                {
-                throw new ArgumentOutOfRangeException("source",
-                    "The specified length is greater than the length of the string.");
-                }
-            return source.Substring(srcLength - length, length);
-            }
-
-        /// <summary>
-        ///     Converts a tring to a hex representation, suitable for display in a debugger.
-        /// </summary>
-        /// <param name="source">The source string.</param>
-        /// <returns>A new string showing each character of the source string as a hex digit.</returns>
-        public static string ToHex(this string source)
-            {
-            const string formatWithSeperator = ", {0,2:x}";
-            const string formatNoSeperator = "{0,2:x}";
-            var hexString = new StringBuilder(source.Length * 7);
-            hexString.Append('{');
-            var seperator = false;
-            foreach (var ch in source)
-                {
-                hexString.AppendFormat(seperator ? formatWithSeperator : formatNoSeperator, (int) ch);
-                seperator = true;
-                }
-            hexString.Append('}');
-            return hexString.ToString();
-            }
-        }
-    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/TA.ArduinoPowerController.AscomSwitch.csproj b/TA.ArduinoPowerController.Switch/TA.ArduinoPowerController.AscomSwitch.csproj
deleted file mode 100644
index 902e939..0000000
--- a/TA.ArduinoPowerController.Switch/TA.ArduinoPowerController.AscomSwitch.csproj
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TA.ArduinoPowerController.AscomSwitch</RootNamespace>
-    <AssemblyName>TA.ArduinoPowerController.AscomSwitch</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <DontImportPostSharp>True</DontImportPostSharp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\BuildOutput\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <PostSharpTargetProcessor>x64</PostSharpTargetProcessor>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\BuildOutput\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>..\BuildOutput\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DEBUG_IN_EXTERNAL_APP</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\BuildOutput\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="ASCOM.Attributes, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
-    <Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
-    <Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
-    <Reference Include="ASCOM.SettingsProvider, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
-    <Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
-    <Reference Include="JetBrains.Annotations, Version=10.4.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\packages\JetBrains.Annotations.10.4.0\lib\net\JetBrains.Annotations.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.5\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp, Version=4.3.31.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.4.3.31\lib\net35-client\PostSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Common, Version=4.3.31.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Common.4.3.31\lib\net45\PostSharp.Patterns.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Model, Version=4.3.31.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Model.4.3.31\lib\net40\PostSharp.Patterns.Model.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp.Patterns.Threading, Version=4.3.31.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.Patterns.Threading.4.3.31\lib\net45\PostSharp.Patterns.Threading.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="TA.Ascom.ReactiveCommunications, Version=0.4.6306.31345, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\TA.Ascom.ReactiveCommunications.0.4.2\lib\net45\TA.Ascom.ReactiveCommunications.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\GlobalAssemblyInfo.cs">
-      <Link>Properties\GlobalAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="AscomDriverAssemblyResolver.cs" />
-    <Compile Include="Octet.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="StringExtensions.cs" />
-    <Compile Include="Switch.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="NLog.dll.Debug.nlog">
-      <DependentUpon>NLog.dll.nlog</DependentUpon>
-      <IsTransformFile>True</IsTransformFile>
-    </None>
-    <Content Include="NLog.dll.nlog">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <TransformOnBuild>true</TransformOnBuild>
-    </Content>
-    <None Include="NLog.dll.Release.nlog">
-      <DependentUpon>NLog.dll.nlog</DependentUpon>
-      <IsTransformFile>True</IsTransformFile>
-    </None>
-    <None Include="packages.config" />
-    <None Include="Scripts\LoadSwitch.ps1" />
-    <None Include="Scripts\WalkingRelayTest.ps1" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TA.ArduinoPowerController.DeviceInterface\TA.ArduinoPowerController.DeviceInterface.csproj">
-      <Project>{3015f05f-d747-4c3e-a0d4-ec2b3bd76c56}</Project>
-      <Name>TA.ArduinoPowerController.DeviceInterface</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\TA.ArduinoPowerController.Server\TA.ArduinoPowerController.Server.csproj">
-      <Project>{3689a2cb-94c5-4012-a5cf-7e7d1dd27143}</Project>
-      <Name>TA.ArduinoPowerController.Server</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\TA.PostSharp.Aspects\TA.PostSharp.Aspects.csproj">
-      <Project>{9cdcf319-dadc-41eb-b787-de3862017e95}</Project>
-      <Name>TA.PostSharp.Aspects</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Diagrams\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets" Condition="Exists('..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets')" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SlowCheetah.2.5.48\build\SlowCheetah.targets'))" />
-  </Target>
-  <Import Project="..\packages\PostSharp.4.3.31\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" />
-  <Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
-    <Error Condition="!Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://www.postsharp.net/links/nuget-restore." />
-    <Error Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
-  </Target>
-  <!-- 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.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/app.config b/TA.ArduinoPowerController.Switch/app.config
deleted file mode 100644
index 199e35c..0000000
--- a/TA.ArduinoPowerController.Switch/app.config
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<configuration>
-  <configSections>
-    <sectionGroup name="userSettings"
-                  type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="TA.ArduinoPowerController.Server.Properties.Settings"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-    </sectionGroup>
-    <sectionGroup name="applicationSettings"
-                  type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="TA.ArduinoPowerController.Server.Properties.Settings"
-               type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"
-               requirePermission="false" />
-    </sectionGroup>
-  </configSections>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.30.0" newVersion="4.3.30.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="PostSharp.Patterns.Common" publicKeyToken="e7f631e6ce13f078" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.30.0" newVersion="4.3.30.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <userSettings>
-    <TA.ArduinoPowerController.Server.Properties.Settings>
-      <setting name="ConnectionString" serializeAs="String">
-        <value>COM1:2400,None,8,One,NoDTR,NoRTS</value>
-      </setting>
-      <setting name="SwitchNames" serializeAs="Xml">
-        <value>
-          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                         xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-            <string>Relay 0</string>
-            <string>Relay 1</string>
-            <string>Relay 2</string>
-            <string>Relay 3</string>
-            <string>Relay 4</string>
-            <string>Relay 5</string>
-            <string>Relay 6</string>
-            <string>Relay 7</string>
-          </ArrayOfString>
-        </value>
-      </setting>
-      <setting name="PortName" serializeAs="String">
-        <value>COM1</value>
-      </setting>
-    </TA.ArduinoPowerController.Server.Properties.Settings>
-  </userSettings>
-  <applicationSettings>
-    <TA.ArduinoPowerController.Server.Properties.Settings>
-      <setting name="MinimumMillisecondsBetweenTransactions" serializeAs="String">
-        <value>500</value>
-      </setting>
-    </TA.ArduinoPowerController.Server.Properties.Settings>
-  </applicationSettings>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-  </startup>
-</configuration>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Switch/packages.config b/TA.ArduinoPowerController.Switch/packages.config
deleted file mode 100644
index 90ec0ae..0000000
--- a/TA.ArduinoPowerController.Switch/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="JetBrains.Annotations" version="10.4.0" targetFramework="net462" />
-  <package id="NLog" version="4.4.5" targetFramework="net462" />
-  <package id="PostSharp" version="4.3.31" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Common" version="4.3.31" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Model" version="4.3.31" targetFramework="net462" />
-  <package id="PostSharp.Patterns.Threading" version="4.3.31" targetFramework="net462" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net462" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net462" />
-  <package id="SlowCheetah" version="2.5.48" targetFramework="net462" />
-  <package id="TA.Ascom.ReactiveCommunications" version="0.4.2" targetFramework="net462" />
-</packages>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/ClassDiagram1.cd b/TA.ArduinoPowerController.Test/ClassDiagram1.cd
new file mode 100644
index 0000000..7b89419
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/ClassDiagram1.cd
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram /> 
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/Common/OctetTests.cs b/TA.ArduinoPowerController.Test/Common/OctetTests.cs
new file mode 100644
index 0000000..7ca85e9
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/Common/OctetTests.cs
@@ -0,0 +1,87 @@
+// This file is part of the TA.ArduinoPowerController project
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: OctetTests.cs  Last modified: 2019-09-08@19:01 by Tim Long
+
+using Machine.Specifications;
+using TA.Utils.Core;
+
+namespace TA.ArduinoPowerController.Test.Common
+{
+    [Subject(typeof(Octet), "Initialization")]
+    internal class when_an_octet_is_initialized_to_zero
+    {
+        Because of = () => zero = Octet.Zero;
+
+        It should_have_all_bits_clear = () =>
+            {
+                for (var i = 0; i < 8; i++)
+                {
+                    zero[i].ShouldBeFalse();
+                }
+            };
+
+        static Octet zero;
+    }
+
+    [Subject(typeof(Octet), "bit clear")]
+    internal class when_a_bit_is_cleared
+    {
+        Establish context = () => immutableOctet = Octet.Max;
+
+        It should_produce_a_new_octet_with_that_bit_cleared = () =>
+            {
+                var octet = Octet.Max; // All bits set
+                for (int i = 0; i < 8; ++i)
+                {
+                    var actual = octet.WithBitSetTo(i, false);
+                    expected[i].ShouldEqual((byte) actual);
+                }
+                immutableOctet.ShouldEqual(Octet.Max);
+            };
+
+        static byte[] expected = {0xFE, 0xFD, 0xFB, 0xF7, 0xEF, 0xDF, 0xBF, 0x7F};
+        static Octet immutableOctet;
+    }
+
+    [Subject(typeof(Octet), "bit set")]
+    internal class when_a_bit_is_set
+    {
+        Establish context = () => immutableOctet = Octet.Zero;
+
+        It should_produce_a_new_octet_with_that_bit_set = () =>
+            {
+                for (int i = 0; i < 8; ++i)
+                {
+                    var actual = immutableOctet.WithBitSetTo(i, true);
+                    expected[i].ShouldEqual((byte) actual);
+                }
+                immutableOctet.ShouldEqual(Octet.Zero);
+            };
+
+        static byte[] expected = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
+        static Octet immutableOctet;
+    }
+
+    [Subject(typeof(Octet), "bitwise AND")]
+    internal class when_a_bitwise_and_is_applied
+    {
+        Establish context = () => mask = 0xAA;
+        Because of = () => actual = Octet.Max & mask;
+        It should_mask_the_false_bits = () => actual.ShouldEqual(mask);
+        static Octet actual;
+        static Octet mask;
+    }
+
+    [Subject(typeof(Octet), "bitwise OR")]
+    internal class when_a_bitwise_or_is_applied
+    {
+        Establish context = () => mask = 0xAA;
+        Because of = () => actual = Octet.Zero | mask;
+        It should_set_the_true_bits = () => actual.ShouldEqual(mask);
+        static Octet actual;
+        static Octet mask;
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/DeviceInterface/WriteRelayTransactionTests.cs b/TA.ArduinoPowerController.Test/DeviceInterface/WriteRelayTransactionTests.cs
new file mode 100644
index 0000000..7c620d5
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/DeviceInterface/WriteRelayTransactionTests.cs
@@ -0,0 +1,31 @@
+// This file is part of the TA.ArduinoPowerController project
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: WriteRelayTransactionTests.cs  Last modified: 2019-09-09@18:46 by Tim Long
+
+using Machine.Specifications;
+using TA.ArduinoPowerController.DeviceInterface;
+using TA.ArduinoPowerController.Test.TestContexts;
+
+namespace TA.ArduinoPowerController.Test.DeviceInterface
+{
+    [Subject(typeof(WriteRelayTransaction), "command")]
+    internal class when_a_relay_transaction_is_processed : with_fake_communications_channel
+    {
+        Establish context = () => Context = Builder
+            .WithFakeResponse(":W00#")
+            .Build();
+
+        Because of = () =>
+            {
+                Transaction = new WriteRelayTransaction(0, false);
+                Context.Processor.CommitTransaction(Transaction);
+                Transaction.WaitForCompletionOrTimeout();
+            };
+
+        It should_succeed = () => Transaction.Successful.ShouldBeTrue();
+        static WriteRelayTransaction Transaction;
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/Fakes/FakeCommunicationChannel.cs b/TA.ArduinoPowerController.Test/Fakes/FakeCommunicationChannel.cs
new file mode 100644
index 0000000..1856b85
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/Fakes/FakeCommunicationChannel.cs
@@ -0,0 +1,103 @@
+// This file is part of the TA.NexDome.AscomServer project
+// Copyright © 2019-2019 Tigra Astronomy, all rights reserved.
+
+using System.Reactive.Linq;
+using System.Reactive.Subjects;
+using TA.Ascom.ReactiveCommunications;
+
+namespace TA.NexDome.Specifications.Fakes
+    {
+    using System;
+    using System.Diagnostics.Contracts;
+    using System.Text;
+    using TA.Utils.Core.Diagnostics;
+
+    /// <summary>
+    ///     A fake communication channel that logs any sent data in <see cref="SendLog" />and
+    ///     receives a fake pre-programmed response passed into the constructor. The class also
+    ///     keeps a count of how many times each method of <see cref="ICommunicationChannel" /> was
+    ///     called.
+    /// </summary>
+    public class FakeCommunicationChannel : ICommunicationChannel
+    {
+        readonly IObservable<char> receivedCharacters;
+
+        readonly Subject<char> receiveChannelSubject = new Subject<char>();
+
+        readonly StringBuilder sendLog;
+
+        readonly ILog Log = new TA.Utils.Logging.NLog.LoggingService();
+
+        /// <summary>
+        ///     Dependency injection constructor.
+        ///     Initializes a new instance of the <see cref="SafetyMonitorDriver" /> class.
+        /// </summary>
+        /// <param name="endpoint"></param>
+        /// <param name="fakeResponse">Implementation of the injected dependency.</param>
+        public FakeCommunicationChannel(DeviceEndpoint endpoint, string fakeResponse)
+        {
+            Contract.Requires(fakeResponse != null);
+            Endpoint = endpoint;
+            Response = fakeResponse;
+            receivedCharacters = fakeResponse.ToCharArray().ToObservable();
+            sendLog = new StringBuilder();
+            IsOpen = false;
+        }
+
+        /// <summary>
+        ///     Gets the send log.
+        /// </summary>
+        /// <value>The send log.</value>
+        public string SendLog => sendLog.ToString();
+
+        /// <summary>
+        ///     Gets a copy of the fake pre-programmed response.
+        /// </summary>
+        /// <value>The response.</value>
+        public string Response { get; }
+
+        public int TimesDisposed { get; set; }
+
+        public int TimesClosed { get; set; }
+
+        public int TimesOpened { get; set; }
+
+        public void Dispose()
+        {
+            TimesDisposed++;
+        }
+
+        public void Open()
+        {
+            TimesOpened++;
+            IsOpen = true;
+        }
+
+        public void Close()
+        {
+            TimesClosed++;
+            IsOpen = false;
+        }
+
+        public void Send(string txData)
+        {
+            Log.Info().Message($"Send: {txData}").Property(nameof(txData), txData).Write();
+            sendLog.Append(txData);
+            foreach (char c in Response) receiveChannelSubject.OnNext(c);
+        }
+
+        public IObservable<char> ObservableReceivedCharacters => receiveChannelSubject.AsObservable();
+
+        public bool IsOpen { get; set; }
+
+        public DeviceEndpoint Endpoint { get; }
+
+        public static ICommunicationChannel FromEndpoint(DeviceEndpoint endpoint)
+        {
+            if (!(endpoint is FakeEndpoint))
+                throw new ArgumentException($"Expected a FakeEndpoint, got a {endpoint.GetType().Name}");
+            var fake = endpoint as FakeEndpoint;
+            return new FakeCommunicationChannel(endpoint, fake.FakeResponse);
+        }
+    }
+}
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/Fakes/FakeEndpoint.cs b/TA.ArduinoPowerController.Test/Fakes/FakeEndpoint.cs
new file mode 100644
index 0000000..acdcf40
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/Fakes/FakeEndpoint.cs
@@ -0,0 +1,41 @@
+// This file is part of the TA.NexDome.AscomServer project
+// Copyright © 2019-2019 Tigra Astronomy, all rights reserved.
+
+using System;
+using System.Text.RegularExpressions;
+
+namespace TA.NexDome.Specifications.Fakes
+    {
+    using TA.Ascom.ReactiveCommunications;
+
+    class FakeEndpoint : DeviceEndpoint
+        {
+            public string FakeResponse { get; }
+
+            public FakeEndpoint(string fakeResponse = null)
+            {
+                this.FakeResponse = fakeResponse;
+            }
+
+        public override string ToString()
+            {
+            return "fake device";
+            }
+
+        public static bool IsConnectionStringValid(string connectionString) =>
+            connectionString.StartsWith("Fake", StringComparison.InvariantCultureIgnoreCase);
+
+        public static DeviceEndpoint FromConnectionString(string connectionString)
+        {
+            const string endpointParsePattern = "^Fake(:(?<Response>.*))?$";
+            var parser = new Regex(endpointParsePattern,
+                RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture |
+                RegexOptions.IgnoreCase | RegexOptions.Singleline);
+            var match = parser.Match(connectionString);
+            if (!match.Success)
+                throw new ArgumentException("unable to parse the connection string");
+            var fakeResponse = match.Groups["Response"].Value;
+            return new FakeEndpoint(fakeResponse);
+        }
+        }
+    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/Fakes/FakeTransactionProcessor.cs b/TA.ArduinoPowerController.Test/Fakes/FakeTransactionProcessor.cs
new file mode 100644
index 0000000..f691f27
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/Fakes/FakeTransactionProcessor.cs
@@ -0,0 +1,36 @@
+// This file is part of the TA.NexDome.AscomServer project
+// Copyright © 2019-2019 Tigra Astronomy, all rights reserved.
+
+namespace TA.NexDome.Specifications.Fakes
+    {
+    using System.Collections.Generic;
+    using System.Linq;
+
+    using TA.Ascom.ReactiveCommunications;
+
+    class FakeTransactionProcessor : ITransactionProcessor
+        {
+        readonly IEnumerable<string> fakeResponses;
+
+        readonly IEnumerator<string> responseEnumerator;
+
+        public FakeTransactionProcessor(IEnumerable<string> fakeResponses)
+            {
+            var enumerable = fakeResponses.ToList();
+            this.fakeResponses = enumerable;
+            responseEnumerator = enumerable.GetEnumerator();
+            }
+
+        public List<DeviceTransaction> ProcessedTransactions { get; } = new List<DeviceTransaction>();
+
+        public void CommitTransaction(DeviceTransaction transaction)
+            {
+            bool moreResponses = responseEnumerator.MoveNext();
+            if (moreResponses)
+                transaction.SimulateCompletionWithResponse(responseEnumerator.Current);
+            else
+                transaction.TimedOut("Timeout");
+            ProcessedTransactions.Add(transaction);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/Fakes/TestableDeviceTransaction.cs b/TA.ArduinoPowerController.Test/Fakes/TestableDeviceTransaction.cs
new file mode 100644
index 0000000..e0c85d3
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/Fakes/TestableDeviceTransaction.cs
@@ -0,0 +1,42 @@
+// This file is part of the TA.NexDome.AscomServer project
+// Copyright © 2019-2019 Tigra Astronomy, all rights reserved.
+
+namespace TA.NexDome.Specifications.Fakes
+    {
+    using System;
+
+    using TA.Ascom.ReactiveCommunications;
+    using TA.Utils.Core;
+
+    class TestableDeviceTransaction : DeviceTransaction
+        {
+        readonly DeviceTransaction sourceTransaction;
+
+        public TestableDeviceTransaction(DeviceTransaction sourceTransaction)
+            : base(sourceTransaction.Command)
+            {
+            this.sourceTransaction = sourceTransaction;
+            }
+
+        public override void ObserveResponse(IObservable<char> source)
+            {
+            throw new NotImplementedException();
+            }
+
+        void SetResponse(string response)
+            {
+            Response = Maybe<string>.From(response);
+            }
+
+        internal void SignalCompletion(string fakeResponse)
+            {
+            SetResponse(fakeResponse);
+            OnCompleted();
+            }
+
+        public void SignalError(string error)
+            {
+            OnError(new TimeoutException(error));
+            }
+        }
+    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/Fakes/TransactionExtensions.cs b/TA.ArduinoPowerController.Test/Fakes/TransactionExtensions.cs
new file mode 100644
index 0000000..145f0ca
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/Fakes/TransactionExtensions.cs
@@ -0,0 +1,85 @@
+// This file is part of the TA.NexDome.AscomServer project
+// Copyright © 2019-2019 Tigra Astronomy, all rights reserved.
+
+namespace TA.NexDome.Specifications.Fakes
+    {
+    using System;
+    using System.Reflection;
+
+    using JetBrains.Annotations;
+
+    using TA.Ascom.ReactiveCommunications;
+    using TA.Utils.Core;
+
+    /// <summary>
+    ///     Extension methods for manipulating non-public members of transaction classes.
+    /// </summary>
+    static class TransactionExtensions
+        {
+        /// <summary>
+        ///     Sets the protected response property.
+        /// </summary>
+        /// <param name="transaction">The transaction.</param>
+        /// <param name="response">The response string, which can be null or empty.</param>
+        /// <seealso cref="SimulateCompletionWithResponse" />
+        public static void SetResponse(this DeviceTransaction transaction, [CanBeNull] string response)
+            {
+            var maybeResponse = Maybe<string>.From(response);
+            var transactionType = typeof(DeviceTransaction);
+            var responseProperty = transactionType.GetProperty("Response");
+            responseProperty.SetValue(
+                transaction,
+                maybeResponse,
+                BindingFlags.Instance | BindingFlags.NonPublic,
+                null,
+                null,
+                null);
+            }
+
+        /// <summary>
+        ///     Marks a transaction as completed with the supplied response string, which will release any waiting threads.
+        /// </summary>
+        /// <param name="transaction">The transaction.</param>
+        /// <param name="response">The response.</param>
+        public static void SimulateCompletionWithResponse(this DeviceTransaction transaction, [NotNull] string response)
+            {
+            transaction.SetResponse(response);
+            var transactionType = transaction.GetType();
+            var makeHotMethod = transactionType.GetMethod("MakeHot", BindingFlags.Instance | BindingFlags.NonPublic);
+            makeHotMethod.Invoke(
+                transaction,
+                BindingFlags.NonPublic | BindingFlags.Instance,
+                Type.DefaultBinder,
+                new object[] { },
+                null);
+            var onCompletedMethod = transactionType.GetMethod(
+                "OnCompleted",
+                BindingFlags.Instance | BindingFlags.NonPublic);
+            onCompletedMethod.Invoke(
+                transaction,
+                BindingFlags.NonPublic | BindingFlags.Instance,
+                Type.DefaultBinder,
+                new object[] { },
+                null);
+            }
+
+        /// <summary>
+        ///     Marks a transaction as Failed and provides a <see cref="TimeoutException" /> as the source of failure.
+        ///     This also completes the transaction and releases any waiting threads.
+        /// </summary>
+        /// <param name="transaction">The transaction.</param>
+        /// <param name="message">The message.</param>
+        public static void TimedOut(this DeviceTransaction transaction, string message = null)
+            {
+            var exception = new TimeoutException(message ?? "Timeout");
+            var type = transaction.GetType();
+            var onErrorMethod = type.GetMethod("OnError", BindingFlags.Instance | BindingFlags.NonPublic);
+            onErrorMethod.Invoke(
+                transaction,
+                BindingFlags.NonPublic | BindingFlags.Instance,
+                Type.DefaultBinder,
+                new object[] { exception },
+                null);
+            }
+        }
+    }
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/LogSetup.cs b/TA.ArduinoPowerController.Test/LogSetup.cs
new file mode 100644
index 0000000..d28990a
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/LogSetup.cs
@@ -0,0 +1,35 @@
+using JetBrains.Annotations;
+using Machine.Specifications;
+using NLog;
+using NLog.Config;
+using NLog.Targets;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TA.Utils.Core.Diagnostics;
+
+namespace TA.ArduinoPowerController.Test
+    {
+    [UsedImplicitly]
+    public class LogSetup : IAssemblyContext
+        {
+        static ILog log;
+
+        public void OnAssemblyStart()
+            {
+            var configuration = new LoggingConfiguration();
+            var unitTestRunnerTarget = new TraceTarget();
+            unitTestRunnerTarget.RawWrite = true;
+            configuration.AddTarget("Unit test runner", unitTestRunnerTarget);
+            var logEverything = new LoggingRule("*", LogLevel.Debug, unitTestRunnerTarget);
+            configuration.LoggingRules.Add(logEverything);
+            LogManager.Configuration = configuration;
+            log = new TA.Utils.Logging.NLog.LoggingService();
+            log.Info().Message("Logging initialized").Write();
+            }
+
+        public void OnAssemblyComplete() { }
+        }
+    }
diff --git a/TA.ArduinoPowerController.Switch.Specifications/Properties/AssemblyInfo.cs b/TA.ArduinoPowerController.Test/Properties/AssemblyInfo.cs
similarity index 77%
rename from TA.ArduinoPowerController.Switch.Specifications/Properties/AssemblyInfo.cs
rename to TA.ArduinoPowerController.Test/Properties/AssemblyInfo.cs
index 845e71d..dc4578a 100644
--- a/TA.ArduinoPowerController.Switch.Specifications/Properties/AssemblyInfo.cs
+++ b/TA.ArduinoPowerController.Test/Properties/AssemblyInfo.cs
@@ -2,34 +2,34 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("ASCOM.K8056.Switch.Specifications")]
+[assembly: AssemblyTitle("TA.ArduinoPowerController.Test")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ASCOM.K8056.Switch.Specifications")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyProduct("TA.ArduinoPowerController.Test")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c006703f-2193-481d-aa15-f46d2fb2a21b")]
+[assembly: Guid("4c2ba771-da96-4922-ac98-e68f202b9b47")]
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
diff --git a/TA.ArduinoPowerController.Test/TA.ArduinoPowerController.Test.csproj b/TA.ArduinoPowerController.Test/TA.ArduinoPowerController.Test.csproj
new file mode 100644
index 0000000..9b63c96
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/TA.ArduinoPowerController.Test.csproj
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{4C2BA771-DA96-4922-AC98-E68F202B9B47}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TA.ArduinoPowerController.Test</RootNamespace>
+    <AssemblyName>TA.ArduinoPowerController.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Remoting" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Serialization" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Common\OctetTests.cs" />
+    <Compile Include="DeviceInterface\WriteRelayTransactionTests.cs" />
+    <Compile Include="Fakes\FakeCommunicationChannel.cs" />
+    <Compile Include="Fakes\FakeEndpoint.cs" />
+    <Compile Include="Fakes\FakeTransactionProcessor.cs" />
+    <Compile Include="Fakes\TestableDeviceTransaction.cs" />
+    <Compile Include="Fakes\TransactionExtensions.cs" />
+    <Compile Include="LogSetup.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestContexts\CommunicationsChannelContext.cs" />
+    <Compile Include="TestContexts\CommunicationsChannelContextBuilder.cs" />
+    <Compile Include="TestContexts\with_fake_communications_channel.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Machine.Specifications">
+      <Version>1.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="Machine.Specifications.Should">
+      <Version>1.0.0</Version>
+    </PackageReference>
+    <PackageReference Include="TA.Ascom.ReactiveCommunications">
+      <Version>1.4.0</Version>
+    </PackageReference>
+    <PackageReference Include="TA.Utils.Logging.Nlog">
+      <Version>1.3.0</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TA.ArduinoPowerController.DeviceInterface\TA.ArduinoPowerController.DeviceInterface.csproj">
+      <Project>{3015f05f-d747-4c3e-a0d4-ec2b3bd76c56}</Project>
+      <Name>TA.ArduinoPowerController.DeviceInterface</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ClassDiagram1.cd" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/TA.ArduinoPowerController.Test.csproj.DotSettings b/TA.ArduinoPowerController.Test/TA.ArduinoPowerController.Test.csproj.DotSettings
new file mode 100644
index 0000000..85113d1
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/TA.ArduinoPowerController.Test.csproj.DotSettings
@@ -0,0 +1,354 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeMemberModifiers/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeTypeModifiers/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/APPLY_ON_COMPLETION/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Implicit</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Implicit</s:String>
+	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
+&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
+  &lt;FilePattern RemoveRegions="AllExceptGenerated"&gt;&#xD;
+    &lt;Region Name=" Context base classes"&gt;&#xD;
+      &lt;Entry DisplayName="with_"&gt;&#xD;
+        &lt;Entry.Match&gt;&#xD;
+          &lt;And&gt;&#xD;
+            &lt;Kind Is="Class" /&gt;&#xD;
+            &lt;Name Is="^with_.+$" IgnoreCase="True" /&gt;&#xD;
+          &lt;/And&gt;&#xD;
+        &lt;/Entry.Match&gt;&#xD;
+      &lt;/Entry&gt;&#xD;
+    &lt;/Region&gt;&#xD;
+    &lt;Entry DisplayName="when_"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Kind Is="Class" /&gt;&#xD;
+          &lt;Or&gt;&#xD;
+            &lt;HasAttribute Name="^Subject$" /&gt;&#xD;
+            &lt;Name Is="^when_.+$" IgnoreCase="True" /&gt;&#xD;
+          &lt;/Or&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/FilePattern&gt;&#xD;
+  &lt;TypePattern DisplayName="Machine.Specifications"&gt;&#xD;
+    &lt;TypePattern.Match&gt;&#xD;
+      &lt;And&gt;&#xD;
+        &lt;Kind Is="Class" /&gt;&#xD;
+        &lt;Not&gt;&#xD;
+          &lt;Access Is="Private" /&gt;&#xD;
+        &lt;/Not&gt;&#xD;
+        &lt;Or&gt;&#xD;
+          &lt;HasAttribute Name="^Subject(Attribute)?$" /&gt;&#xD;
+          &lt;Name Is="^with_.+$" IgnoreCase="True" /&gt;&#xD;
+          &lt;Name Is="^when_.+$" IgnoreCase="True" /&gt;&#xD;
+        &lt;/Or&gt;&#xD;
+      &lt;/And&gt;&#xD;
+    &lt;/TypePattern.Match&gt;&#xD;
+    &lt;Entry DisplayName="Establish context"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Private" /&gt;&#xD;
+          &lt;Kind Is="Field" /&gt;&#xD;
+          &lt;Name Is="^context$" IgnoreCase="True" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Because of"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Private" /&gt;&#xD;
+          &lt;Kind Is="Field" /&gt;&#xD;
+          &lt;Name Is="^of$" IgnoreCase="True" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="It should"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Private" /&gt;&#xD;
+          &lt;Kind Is="Field" /&gt;&#xD;
+          &lt;Name Is="^should_.+$" IgnoreCase="True" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Cleanup after"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Private" /&gt;&#xD;
+          &lt;Kind Is="Field" /&gt;&#xD;
+          &lt;Name Is="^after$" IgnoreCase="True" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Static fields"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;And&gt;&#xD;
+          &lt;Access Is="Any" /&gt;&#xD;
+          &lt;Static /&gt;&#xD;
+          &lt;Kind Is="Field" /&gt;&#xD;
+        &lt;/And&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+      &lt;Entry.SortBy&gt;&#xD;
+        &lt;Access /&gt;&#xD;
+        &lt;Name Is="Enter Pattern Here" /&gt;&#xD;
+      &lt;/Entry.SortBy&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+    &lt;Entry DisplayName="Other fields"&gt;&#xD;
+      &lt;Entry.Match&gt;&#xD;
+        &lt;Kind Is="Field" /&gt;&#xD;
+      &lt;/Entry.Match&gt;&#xD;
+    &lt;/Entry&gt;&#xD;
+  &lt;/TypePattern&gt;&#xD;
+&lt;/Patterns&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=67bf0822_002D916e_002D4a66_002Db663_002D95bd84b868ab/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="MSpec context base class"&gt;&lt;ElementKinds /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="with_" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=7d6f1b7c_002Dd069_002D4e79_002Da2be_002D5bbb7728b0f3/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="MSpec context class"&gt;&lt;ElementKinds /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="when_" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=b094fb47_002D3d7f_002D4cbb_002Da2f8_002Dbb28913b092b/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="MSpec supporting field"&gt;&lt;ElementKinds /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=c0f315a1_002Dc5b2_002D4db8_002D9344_002Da923f7ccc2ff/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static, Instance" AccessRightKinds="Private, Protected, ProtectedInternal, Internal, Public" Description="MSpec specification"&gt;&lt;ElementKinds /&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="should_" Suffix="" Style="aa_bb" /&gt;&lt;/Policy&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMIXED_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=AutoRecoverer/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Format/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Roslyn_002Dswea/@EntryIndexedValue">DO_NOTHING</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=ShowAnnotations/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=SolExp_002DTrack/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=StartPage_002DIsDownloadRefreshEnabled/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=StartPage_002DOnEnvironmentStatup/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=SyncSettings/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=TextEditor_002DCodeLens/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=TextEditor_002DTrackChanges_002D2/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=VCS/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=VsBulb/@EntryIndexedValue">DO_NOTHING</s:String>
+	<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=XAML_0020Designer/@EntryIndexedValue">LIVE_MONITOR</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Categories/=Imported_002019_002F05_002F2016/@EntryIndexedValue">Imported 19/05/2016</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Description/@EntryValue">Short template for MSpec BDD specification</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Field/=Behaviour/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Field/=Behaviour/Order/@EntryValue">2</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Field/=Specification/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Field/=Specification/Order/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Field/=Subject/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Field/=Subject/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Scope/=558F05AA0DE96347816FF785232CFB2A/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Scope/=558F05AA0DE96347816FF785232CFB2A/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Scope/=558F05AA0DE96347816FF785232CFB2A/Type/@EntryValue">InCSharpTypeAndNamespace</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Shortcut/@EntryValue">specs</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=06CE2469161FAF45AE8B95047F0C0630/Text/@EntryValue">[Subject(typeof($Subject$))]&#xD;
+public class when_$Specification$&#xD;
+{&#xD;
+	It should_$Behaviour$$END$;&#xD;
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Applicability/=File/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/CustomProperties/=Extension/@EntryIndexedValue">cs</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/CustomProperties/=FileName/@EntryIndexedValue">Specs</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/CustomProperties/=ValidateFileName/@EntryIndexedValue">True</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Description/@EntryValue">Specs</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Concern/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Concern/Order/@EntryValue">2</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Context/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Context/Order/@EntryValue">3</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=FileHeader/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=FileHeader/Expression/@EntryValue">fileheader()</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=FileHeader/InitialRange/@EntryValue">-1</s:Int64>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=FileHeader/Order/@EntryValue">4</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Namespace/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Namespace/Expression/@EntryValue">getProjectName()</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Namespace/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Type/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Field/=Type/Order/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Scope/=E8F0594528C33E45BBFEC6CFE851095D/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Scope/=E8F0594528C33E45BBFEC6CFE851095D/Type/@EntryValue">InCSharpProjectFile</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=12A842FC11E6F04980359AF49FAFBD28/Text/@EntryValue">$FileHeader$&#xD;
+&#xD;
+using Machine.Specifications;&#xD;
+&#xD;
+namespace $Namespace$&#xD;
+{&#xD;
+[Subject(typeof($Type$), "$Concern$")]&#xD;
+internal class when_$Context$&#xD;
+{&#xD;
+$END$&#xD;
+It should_make_assertions;&#xD;
+}&#xD;
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Description/@EntryValue">Live template for MSpec 'Because' delegate</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/Type/@EntryValue">InCSharpTypeMember</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Shortcut/@EntryValue">because</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1D2A16F656FA6D40A1AF14C20A25F55E/Text/@EntryValue">Because of = () =&gt; $END$;</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Applicability/=Surround/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Description/@EntryValue">Catch.Exception</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=1E31FF7D6C2E9F409C5AA13C4C2F6405/Text/@EntryValue">Exception = Catch.Exception(() =&gt; { $SELECTION$ });</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Description/@EntryValue">Live template for MSpec 'It' delegate</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Field/=do/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Field/=do/Expression/@EntryValue">JoarOyenLiveTemplateMacros.ValidIdentifier()</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Field/=do/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/Type/@EntryValue">InCSharpTypeMember</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Shortcut/@EntryValue">it</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3A228F297FD77C4F955E5463BA527D3E/Text/@EntryValue">It should_$do$ = () =&gt; $END$;</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Categories/=Imported_002019_002F05_002F2016/@EntryIndexedValue">Imported 19/05/2016</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Description/@EntryValue">Short template for MSpec BDD context</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Field/=Context/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Field/=Context/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Scope/=558F05AA0DE96347816FF785232CFB2A/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Scope/=558F05AA0DE96347816FF785232CFB2A/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Scope/=558F05AA0DE96347816FF785232CFB2A/Type/@EntryValue">InCSharpTypeAndNamespace</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Shortcut/@EntryValue">specc</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=3F30D7F875C02F4787541AD97A9D7093/Text/@EntryValue">public abstract class with_$Context$&#xD;
+{&#xD;
+	Establish context = () =&gt;&#xD;
+	{&#xD;
+		$END$&#xD;
+	};&#xD;
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Categories/=Imported_002019_002F05_002F2016/@EntryIndexedValue">Imported 19/05/2016</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Description/@EntryValue">Template for MSpec BDD specification</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Behaviour/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Behaviour/Order/@EntryValue">3</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Concern/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Concern/Order/@EntryValue">4</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Context/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Context/Order/@EntryValue">2</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Specification/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Specification/Order/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Subject/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Field/=Subject/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Scope/=558F05AA0DE96347816FF785232CFB2A/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Scope/=558F05AA0DE96347816FF785232CFB2A/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Scope/=558F05AA0DE96347816FF785232CFB2A/Type/@EntryValue">InCSharpTypeAndNamespace</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Shortcut/@EntryValue">spect</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4E755F718807B04BB217C6876A2A2FC0/Text/@EntryValue">[Subject(typeof($Subject$), "$Concern$")]&#xD;
+public class when_$Specification$ : with_$Context$&#xD;
+{&#xD;
+	Because of = () =&gt;&#xD;
+	{&#xD;
+		&#xD;
+	};&#xD;
+	&#xD;
+	It should_$Behaviour$$END$;&#xD;
+}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Description/@EntryValue">Live template for MSpec 'Establish' delegate</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Scope/=B68999B9D6B43E47A02B22C12A54C3CC/Type/@EntryValue">InCSharpTypeMember</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Shortcut/@EntryValue">establish</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=4FB0BAF1ABD68641AF1F6B28E9059683/Text/@EntryValue">Establish context = () =&gt; $END$;</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Categories/=Imported_002019_002F05_002F2016/@EntryIndexedValue">Imported 19/05/2016</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Description/@EntryValue">Full template for MSpec BDD specification</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Behaviour/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Behaviour/Order/@EntryValue">2</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Concern/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Concern/Order/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Context/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Context/Expression/@EntryValue">JoarOyenLiveTemplateMacros.ValidIdentifier()</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Context/Order/@EntryValue">3</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Subject/@KeyIndexDefined">True</s:Boolean>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Field/=Subject/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Scope/=558F05AA0DE96347816FF785232CFB2A/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Scope/=558F05AA0DE96347816FF785232CFB2A/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Scope/=558F05AA0DE96347816FF785232CFB2A/Type/@EntryValue">InCSharpTypeAndNamespace</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Shortcut/@EntryValue">spec</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=C42B5EFE754CA44F9297EDFE9B3BDC20/Text/@EntryValue">[Subject(typeof($Subject$), "$Concern$")]&#xD;
+public class when_$Context$&#xD;
+	{&#xD;
+	Establish context ;&#xD;
+	Because of ;&#xD;
+	It should_$Behaviour$$END$;&#xD;
+	}</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/@KeyIndexDefined">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Applicability/=Live/@EntryIndexedValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Categories/=MSpec/@EntryIndexedValue">MSpec</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Description/@EntryValue">Assert that an exception of the expected type was thrown</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Field/=exception/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Field/=exception/Expression/@EntryValue">completeType("System.Exception")</s:String>
+	<s:Int64 x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Field/=exception/Order/@EntryValue">0</s:Int64>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Reformat/@EntryValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Scope/=C3001E7C0DA78E4487072B7E050D86C5/@KeyIndexDefined">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Scope/=C3001E7C0DA78E4487072B7E050D86C5/CustomProperties/=minimumLanguageVersion/@EntryIndexedValue">2.0</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Scope/=C3001E7C0DA78E4487072B7E050D86C5/Type/@EntryValue">InCSharpFile</s:String>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Shortcut/@EntryValue">should-throw</s:String>
+	<s:Boolean x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/ShortenQualifiedReferences/@EntryValue">True</s:Boolean>
+	<s:String x:Key="/Default/PatternsAndTemplates/LiveTemplates/Template/=FF300E769DBF464686E3D359DE395028/Text/@EntryValue">It should_throw = () =&gt; Exception.ShouldBeOfExactType&lt;$exception$&gt;();&#xD;
+static Exception Exception;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/TA.ArduinoPowerController.Test/TestContexts/CommunicationsChannelContext.cs b/TA.ArduinoPowerController.Test/TestContexts/CommunicationsChannelContext.cs
new file mode 100644
index 0000000..79afb5d
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/TestContexts/CommunicationsChannelContext.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TA.Ascom.ReactiveCommunications;
+using TA.NexDome.Specifications.Fakes;
+
+namespace TA.ArduinoPowerController.Test.TestContexts
+    {
+    internal sealed class CommunicationsChannelContext
+        {
+            public ICommunicationChannel Channel { get; set; }
+
+            public FakeCommunicationChannel FakeChannel => Channel as FakeCommunicationChannel;
+
+            public DeviceEndpoint Endpoint => Channel.Endpoint;
+
+            public ReactiveTransactionProcessor Processor { get; set; }
+
+            public ChannelFactory Factory { get; set; }
+
+            public TransactionObserver Observer { get; set; }
+        }
+    }
diff --git a/TA.ArduinoPowerController.Test/TestContexts/CommunicationsChannelContextBuilder.cs b/TA.ArduinoPowerController.Test/TestContexts/CommunicationsChannelContextBuilder.cs
new file mode 100644
index 0000000..68bf626
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/TestContexts/CommunicationsChannelContextBuilder.cs
@@ -0,0 +1,32 @@
+using TA.Ascom.ReactiveCommunications;
+using TA.NexDome.Specifications.Fakes;
+
+namespace TA.ArduinoPowerController.Test.TestContexts
+    {
+    class CommunicationsChannelContextBuilder
+        {
+        CommunicationsChannelContext context = new CommunicationsChannelContext();
+        string connectionString = "Fake";
+        string fakeResponse = string.Empty;
+
+        internal CommunicationsChannelContextBuilder WithFakeResponse(string response)
+            {
+            connectionString = $"Fake:{response}";
+            return this;
+            }
+
+        internal CommunicationsChannelContext Build()
+            {
+            var logService = new TA.Utils.Logging.NLog.LoggingService();
+            context.Factory = new ChannelFactory(logService);
+            context.Factory.RegisterChannelType(FakeEndpoint.IsConnectionStringValid, FakeEndpoint.FromConnectionString, FakeCommunicationChannel.FromEndpoint);
+            context.Channel = context.Factory.FromConnectionString(connectionString);
+            context.Observer = new TransactionObserver(context.Channel);
+            var processor = new ReactiveTransactionProcessor();
+            processor.SubscribeTransactionObserver(context.Observer);
+            context.Processor = processor;
+            context.Channel.Open();
+            return context;
+            }
+        }
+    }
diff --git a/TA.ArduinoPowerController.Test/TestContexts/with_fake_communications_channel.cs b/TA.ArduinoPowerController.Test/TestContexts/with_fake_communications_channel.cs
new file mode 100644
index 0000000..f57cbee
--- /dev/null
+++ b/TA.ArduinoPowerController.Test/TestContexts/with_fake_communications_channel.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Machine.Specifications;
+
+namespace TA.ArduinoPowerController.Test.TestContexts
+    {
+    internal class with_fake_communications_channel
+        {
+            Establish context = () =>
+                {
+                    Builder = new CommunicationsChannelContextBuilder();
+                };
+
+            Cleanup after = () =>
+                {
+                    Context.Processor.Dispose();
+                    Context.Channel?.Close();
+                    Context.Channel?.Dispose();
+                    Context = null;
+                    Builder = null;
+                };
+
+            public static CommunicationsChannelContextBuilder Builder { get; set; }
+            public static CommunicationsChannelContext Context { get; set; }
+        }
+    }
diff --git a/TA.ArduinoPowerController.sln b/TA.ArduinoPowerController.sln
index 0ee939e..3899f1f 100644
--- a/TA.ArduinoPowerController.sln
+++ b/TA.ArduinoPowerController.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.31911.260
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TA.ArduinoPowerController.DeviceInterface", "TA.ArduinoPowerController.DeviceInterface\TA.ArduinoPowerController.DeviceInterface.csproj", "{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}"
 EndProject
@@ -12,65 +12,98 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Shared Items", "Solution Shared Items", "{2D14AE63-4259-4517-8C0B-B5A2A6D47007}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
-		GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs
 		ReadMe.md = ReadMe.md
 		WalkingSwitches.ps1 = WalkingSwitches.ps1
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TA.ArduinoPowerController.AscomSwitch", "TA.ArduinoPowerController.Switch\TA.ArduinoPowerController.AscomSwitch.csproj", "{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}"
-EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "TA.ArduinoPowerController.Setup", "TA.ArduinoPowerController.Setup\TA.ArduinoPowerController.Setup.wixproj", "{B847A048-C924-4134-BD60-C111B0D37C8B}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TA.ArduinoPowerController.SharedCode", "TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.shproj", "{6778254B-A2CD-4364-BF2B-249B59285136}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TA.ArduinoPowerController.Test", "TA.ArduinoPowerController.Test\TA.ArduinoPowerController.Test.csproj", "{4C2BA771-DA96-4922-AC98-E68F202B9B47}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{B767F022-7A39-4D9C-AC2B-ADE7D378FA68}"
+	ProjectSection(SolutionItems) = preProject
+		images\hardware.png = images\hardware.png
+	EndProjectSection
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.projitems*{3015f05f-d747-4c3e-a0d4-ec2b3bd76c56}*SharedItemsImports = 4
+		TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.projitems*{3689a2cb-94c5-4012-a5cf-7e7d1dd27143}*SharedItemsImports = 4
+		TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.projitems*{6778254b-a2cd-4364-bf2b-249b59285136}*SharedItemsImports = 13
+		TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.projitems*{9cdcf319-dadc-41eb-b787-de3862017e95}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Debug|x64.Build.0 = Debug|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Debug|x86.Build.0 = Debug|Any CPU
+		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Release|x64.ActiveCfg = Release|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Release|x64.Build.0 = Release|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Release|x86.ActiveCfg = Release|Any CPU
 		{3015F05F-D747-4C3E-A0D4-EC2B3BD76C56}.Release|x86.Build.0 = Release|Any CPU
+		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x64.Build.0 = Debug|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Debug|x86.Build.0 = Debug|Any CPU
+		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|x64.ActiveCfg = Release|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|x64.Build.0 = Release|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|x86.ActiveCfg = Release|Any CPU
 		{3689A2CB-94C5-4012-A5CF-7E7D1DD27143}.Release|x86.Build.0 = Release|Any CPU
+		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Debug|x64.Build.0 = Debug|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Debug|x86.Build.0 = Debug|Any CPU
+		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Release|x64.ActiveCfg = Release|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Release|x64.Build.0 = Release|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Release|x86.ActiveCfg = Release|Any CPU
 		{9CDCF319-DADC-41EB-B787-DE3862017E95}.Release|x86.Build.0 = Release|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Debug|x64.Build.0 = Debug|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Debug|x86.Build.0 = Debug|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Release|x64.ActiveCfg = Release|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Release|x64.Build.0 = Release|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Release|x86.ActiveCfg = Release|Any CPU
-		{ED0FE6AA-E1E5-4D21-9B5E-802D50EDCCE1}.Release|x86.Build.0 = Release|Any CPU
+		{B847A048-C924-4134-BD60-C111B0D37C8B}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{B847A048-C924-4134-BD60-C111B0D37C8B}.Debug|x64.ActiveCfg = Debug|x64
-		{B847A048-C924-4134-BD60-C111B0D37C8B}.Debug|x64.Build.0 = Debug|x64
 		{B847A048-C924-4134-BD60-C111B0D37C8B}.Debug|x86.ActiveCfg = Debug|x86
-		{B847A048-C924-4134-BD60-C111B0D37C8B}.Debug|x86.Build.0 = Debug|x86
+		{B847A048-C924-4134-BD60-C111B0D37C8B}.Release|Any CPU.ActiveCfg = Release|x86
 		{B847A048-C924-4134-BD60-C111B0D37C8B}.Release|x64.ActiveCfg = Release|x64
 		{B847A048-C924-4134-BD60-C111B0D37C8B}.Release|x64.Build.0 = Release|x64
 		{B847A048-C924-4134-BD60-C111B0D37C8B}.Release|x86.ActiveCfg = Release|x86
 		{B847A048-C924-4134-BD60-C111B0D37C8B}.Release|x86.Build.0 = Release|x86
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Debug|x64.Build.0 = Debug|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Debug|x86.Build.0 = Debug|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Release|x64.ActiveCfg = Release|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Release|x64.Build.0 = Release|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Release|x86.ActiveCfg = Release|Any CPU
+		{4C2BA771-DA96-4922-AC98-E68F202B9B47}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {CA042B53-2A8D-4E52-8866-82EAA3672D22}
+	EndGlobalSection
 EndGlobal
diff --git a/TA.ArduinoPowerController.sln.DotSettings b/TA.ArduinoPowerController.sln.DotSettings
deleted file mode 100644
index ce1dd75..0000000
--- a/TA.ArduinoPowerController.sln.DotSettings
+++ /dev/null
@@ -1,163 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Machine_002ESpecifications_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_INTERNAL_MODIFIER/@EntryValue">Explicit</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/DEFAULT_PRIVATE_MODIFIER/@EntryValue">Explicit</s:String>
-	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
-&lt;Patterns xmlns="urn:schemas-jetbrains-com:member-reordering-patterns"&gt;&#xD;
-  &lt;TypePattern DisplayName="COM interfaces or structs"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;Or&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Interface" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.InterfaceTypeAttribute" /&gt;&#xD;
-            &lt;HasAttribute Name="System.Runtime.InteropServices.ComImport" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-        &lt;Kind Is="Struct" /&gt;&#xD;
-      &lt;/Or&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="NUnit Test Fixtures" RemoveRegions="All"&gt;&#xD;
-    &lt;TypePattern.Match&gt;&#xD;
-      &lt;And&gt;&#xD;
-        &lt;Kind Is="Class" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestFixtureAttribute" Inherited="True" /&gt;&#xD;
-        &lt;HasAttribute Name="NUnit.Framework.TestCaseFixtureAttribute" Inherited="True" /&gt;&#xD;
-      &lt;/And&gt;&#xD;
-    &lt;/TypePattern.Match&gt;&#xD;
-    &lt;Entry DisplayName="Setup/Teardown Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;Or&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.SetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.TearDownAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureSetUpAttribute" Inherited="True" /&gt;&#xD;
-            &lt;HasAttribute Name="NUnit.Framework.FixtureTearDownAttribute" Inherited="True" /&gt;&#xD;
-          &lt;/Or&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members" /&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Test Methods"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Method" /&gt;&#xD;
-          &lt;HasAttribute Name="NUnit.Framework.TestAttribute" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-  &lt;TypePattern DisplayName="Default Pattern"&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Public Delegates"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Access Is="Public" /&gt;&#xD;
-          &lt;Kind Is="Delegate" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Public Enums"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Access Is="Public" /&gt;&#xD;
-          &lt;Kind Is="Enum" /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="Static Fields and Constants"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;Or&gt;&#xD;
-          &lt;Kind Is="Constant" /&gt;&#xD;
-          &lt;And&gt;&#xD;
-            &lt;Kind Is="Field" /&gt;&#xD;
-            &lt;Static /&gt;&#xD;
-          &lt;/And&gt;&#xD;
-        &lt;/Or&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Kind Order="Constant Field" /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="Fields"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Field" /&gt;&#xD;
-          &lt;Not&gt;&#xD;
-            &lt;Static /&gt;&#xD;
-          &lt;/Not&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Readonly /&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="Constructors"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;Kind Is="Constructor" /&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Static /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="Properties, Indexers"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;Or&gt;&#xD;
-          &lt;Kind Is="Property" /&gt;&#xD;
-          &lt;Kind Is="Indexer" /&gt;&#xD;
-        &lt;/Or&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry Priority="100" DisplayName="Interface Implementations"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;And&gt;&#xD;
-          &lt;Kind Is="Member" /&gt;&#xD;
-          &lt;ImplementsInterface /&gt;&#xD;
-        &lt;/And&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;ImplementsInterface /&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="All other members"&gt;&#xD;
-      &lt;Entry.SortBy&gt;&#xD;
-        &lt;Name /&gt;&#xD;
-      &lt;/Entry.SortBy&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-    &lt;Entry DisplayName="Nested Types"&gt;&#xD;
-      &lt;Entry.Match&gt;&#xD;
-        &lt;Kind Is="Type" /&gt;&#xD;
-      &lt;/Entry.Match&gt;&#xD;
-    &lt;/Entry&gt;&#xD;
-  &lt;/TypePattern&gt;&#xD;
-&lt;/Patterns&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">This file is part of the $SOLUTION$ project&#xD;
-&#xD;
-Copyright © 2016-$CURRENT_YEAR$ Tigra Astronomy, all rights reserved.&#xD;
-Licensed under the MIT license, see http://tigra.mit-license.org/&#xD;
-&#xD;
-File: $FILENAME$  Last modified: $CURRENT_YEAR$-$CURRENT_MONTH$-$CURRENT_DAY$@$CURRENT_TIME$ by $USER_NAME$</s:String>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=A6161FA2ECF5704A9264E31DC4996B95/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=A6161FA2ECF5704A9264E31DC4996B95/AbsolutePath/@EntryValue">D:\VS-Projects\ASCOM.K8056.Switch\ASCOM.K8056.Switch.Specifications\ASCOM.K8056.Switch.Specifications.DotSettings</s:String>
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=A6161FA2ECF5704A9264E31DC4996B95/RelativePath/@EntryValue">..\ASCOM.K8056.Switch.Specifications\ASCOM.K8056.Switch.Specifications.DotSettings</s:String>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileA6161FA2ECF5704A9264E31DC4996B95/@KeyIndexDefined">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileA6161FA2ECF5704A9264E31DC4996B95/IsOn/@EntryValue">False</s:Boolean>
-	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileA6161FA2ECF5704A9264E31DC4996B95/RelativePriority/@EntryValue">1</s:Double>
-	<s:Boolean x:Key="/Default/Environment/MemoryUsageIndicator/IsVisible/@EntryValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:String x:Key="/Default/Housekeeping/ProjectModelSynchronizer/UseMsbuildStrategy/@EntryValue">AUTO</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/TA.PostSharp.Aspects/MustBeConnectedAttribute.cs b/TA.PostSharp.Aspects/MustBeConnectedAttribute.cs
index 9a4a362..5b9bfbf 100644
--- a/TA.PostSharp.Aspects/MustBeConnectedAttribute.cs
+++ b/TA.PostSharp.Aspects/MustBeConnectedAttribute.cs
@@ -1,9 +1,9 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
-// Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
-// Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: MustBeConnectedAttribute.cs  Last modified: 2017-03-16@23:34 by Tim Long
+//
+// Copyright © 2016-2019 Tigra Astronomy, all rights reserved.
+// Licensed under the Tigra MIT license, see http://tigra.mit-license.org/
+//
+// File: MustBeConnectedAttribute.cs  Last modified: 2019-09-08@05:25 by Tim Long
 
 using System;
 using System.Reflection;
@@ -13,7 +13,7 @@
 using PostSharp.Extensibility;
 
 namespace TA.PostSharp.Aspects
-    {
+{
     /// <summary>
     ///     MustBeConnected aspect. Verifies that the controlled device is connected and if not,
     ///     throws a
@@ -22,29 +22,19 @@ namespace TA.PostSharp.Aspects
     [Serializable]
     [ProvideAspectRole("ASCOM")]
     public sealed class MustBeConnectedAttribute : OnMethodBoundaryAspect
-        {
+    {
         private static int nesting;
 
-        /// <summary>
-        ///     Initializes a new instance of the <see cref="MustBeConnectedAttribute" /> class. Forces
-        ///     the <see cref="ApplyToStateMachine" /> property to false, as this aspect should only
-        ///     check advices upon first entry to any method.
-        /// </summary>
-        public MustBeConnectedAttribute()
-            {
-            ApplyToStateMachine = false;
-            }
-
         public override bool CompileTimeValidate(MethodBase method)
-            {
+        {
             var targetType = method.DeclaringType;
             if (!typeof(IAscomDriver).IsAssignableFrom(targetType))
-                {
+            {
                 throw new InvalidAnnotationException(
                     "This aspect can only be applied to members of types that implement IAscomDriver");
-                }
-            return base.CompileTimeValidate(method);
             }
+            return base.CompileTimeValidate(method);
+        }
 
         /// <summary>
         ///     Verifies that the  device is connected. Throws <see cref="NotConnectedException" />
@@ -59,17 +49,17 @@ public override bool CompileTimeValidate(MethodBase method)
         ///     Thrown if the device is not connected.
         /// </exception>
         public override void OnEntry(MethodExecutionArgs args)
-            {
+        {
             base.OnEntry(args);
             var instance = args.Instance as IAscomDriver;
             if (nesting++ > 0) return; // Optimization - no need to check in nested calls.
             if (!instance.Connected)
-                {
+            {
                 var name = args.Method.Name;
                 var message = $"{name} requires that Connected is true but it was false";
                 throw new NotConnectedException(message);
-                }
             }
+        }
 
         /// <summary>
         ///     Method executed <b>after</b> the body of methods to which this aspect is applied,
@@ -81,9 +71,9 @@ public override void OnEntry(MethodExecutionArgs args)
         ///     is being executed and which are its arguments.
         /// </param>
         public override void OnExit(MethodExecutionArgs args)
-            {
+        {
             base.OnExit(args);
             nesting--;
-            }
         }
-    }
\ No newline at end of file
+    }
+}
\ No newline at end of file
diff --git a/TA.PostSharp.Aspects/Properties/AssemblyInfo.cs b/TA.PostSharp.Aspects/Properties/AssemblyInfo.cs
index 504a19b..5d0e497 100644
--- a/TA.PostSharp.Aspects/Properties/AssemblyInfo.cs
+++ b/TA.PostSharp.Aspects/Properties/AssemblyInfo.cs
@@ -1,46 +1,11 @@
 // This file is part of the TA.ArduinoPowerController project
-// 
+//
 // Copyright © 2016-2017 Tigra Astronomy, all rights reserved.
 // Licensed under the MIT license, see http://tigra.mit-license.org/
-// 
-// File: AssemblyInfo.cs  Last modified: 2017-03-16@23:34 by Tim Long
+//
+// File: AssemblyInfo.cs  Last modified: 2017-03-16@23:33 by Tim Long
 
 using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 
 [assembly: AssemblyTitle("TA.PostSharp.Aspects")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TA.PostSharp.Aspects")]
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-
-[assembly: Guid("9cdcf319-dadc-41eb-b787-de3862017e95")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
\ No newline at end of file
+[assembly: AssemblyDescription("AOP Aspects for Arduino Power Controller")]
\ No newline at end of file
diff --git a/TA.PostSharp.Aspects/ReadMe.md b/TA.PostSharp.Aspects/ReadMe.md
new file mode 100644
index 0000000..7280615
--- /dev/null
+++ b/TA.PostSharp.Aspects/ReadMe.md
@@ -0,0 +1,49 @@
+# About PostShapr Aspects
+
+This project contains a number of PostSharp "Aspects".
+
+"Aspect" is a term used in Apect Oriented Programming (AOP) that refers to a specially constructed class that can be injected into user code after compilation has been performed. This allows "boiler plate" code and design patterns to be added declaratively, keeping user code cleaner and simpler.
+
+`PostSharp` is an AOP framework and compiler for .NET projects. The `PostSharp` compiler runs after the .NET compiler and "weaves" aspects into the already compiled user code. Everything needed for this to work is contained in the `PostSharp.*` NuGet packages. There is a Visual Studio extension that adds some Intellisense and designer support, but the extension is optional and is not needed for PostSharp to work.
+
+Common uses for AOP are:
+- to declaratively introduce logging into classes that otherwise don't have it
+- to implement standard patterns patterns such as `INotifyPropertyChanged`
+- to enforce certain threading models and patterns, such as Reader-Writer Lock
+- to add code contracts to method calls
+
+It is also possible to produce user-written custom aspects. 
+
+Aspects are implemented as .NET attributes, and applying an aspect to an assembly, class or class member is as easy as applying an attribute. For example, data models can be made to implement `INotifyPropertyChanged` simply by applying the `[NotifyPropertyChanged]` attribute to the class.
+
+## Solution Aspect Usage
+
+This solution uses the `[ReaderWriterSynchronized`] threading pattern to implement a Reader-Writer Lock within the `ClientConnectionmanager` class. It also defines some custom aspects that are useful in ASCOM drivers, such as `MustBeConnectedAttribute` and `NLogTraceWithArgumentsAttribute`. These are described in following paragraphs.
+
+## PostSharp Licensing
+
+`PostSharp Essentials` is free and provides unlimited logging and all other patterns on up to 10 classes per solution. This will often be enough for an ASCOM driver project if aspects are used judiciously, as is the case in this solution.
+
+If you do not wish to use PostSharp for any reason, simply uninstall the NuGet packages. You will then have to add equivalent code to your projects for any PostSharp aspects that were in use. These are documented below.
+
+## `ReaderWriterSynchronized` Threading Model
+
+This is used to protect the `ClientConnectionmanager` class from race conditions.
+
+If PostSharp is removed from the solution, then an alternative solution must be found. There are numberous articles on implementing the Reader-Writer Lock pattern, [including this one][ReaderWriterLock].
+
+## `MustBeConnected` Aspect
+
+This aspect attribute can be applied to any method or property of an ASCOM driver that implements the `IAscomDriver` marker interface. When applied to a property or method, that property or method will check the value of the `Connected` property and will throw a `NotConnectedException` if it is false.
+
+The aspect is coded so that nested calls to properties and methods only check the `Connected` property once at the start. This was done partly for efficience and partly so that log output is more readable.
+
+This aspect is used in the `Switch` class on the `Action`, `GetSwitch`, `GetSwitchValue`, `SetSwitch` and `SetSwitchValue` methods. If postSharp is removed, these methods should manually check the `Connected` property.
+
+## `NLogTraceWithArguments` Aspect
+
+This aspect can be applied to any class and will inject logging of method calls (with argument values) and returns (with return values) into every property and method of that class.
+
+We use this to inject logging into driver classes so that all driver calls are logged, along with argument values and return values.
+
+[ReaderWriterLock]: https://www.c-sharpcorner.com/UploadFile/1d42da/readerwriterlock-class-in-C-Sharp-threading/ "CSharp Corner: ReaderWriterLock Class in C# Threading"
\ No newline at end of file
diff --git a/TA.PostSharp.Aspects/TA.PostSharp.Aspects.csproj b/TA.PostSharp.Aspects/TA.PostSharp.Aspects.csproj
index bb31c43..548a4e9 100644
--- a/TA.PostSharp.Aspects/TA.PostSharp.Aspects.csproj
+++ b/TA.PostSharp.Aspects/TA.PostSharp.Aspects.csproj
@@ -9,11 +9,11 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TA.PostSharp.Aspects</RootNamespace>
     <AssemblyName>TA.PostSharp.Aspects</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <DontImportPostSharp>True</DontImportPostSharp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -33,55 +33,13 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Astrometry.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Attributes, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Attributes.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Controls, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Controls.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.DeviceInterfaces.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.DriverAccess, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.DriverAccess.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Exceptions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Internal.Extensions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Internal.Extensions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.SettingsProvider, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.SettingsProvider.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Utilities.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ASCOM.Utilities.Video, Version=6.1.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
-      <HintPath>..\packages\ASCOM.Platform.6.3.0\lib\net40\ASCOM.Utilities.Video.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.4.5\lib\net45\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="PostSharp, Version=4.3.31.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
-      <HintPath>..\packages\PostSharp.4.3.31\lib\net35-client\PostSharp.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -96,19 +54,31 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <AdditionalFiles Include="..\TA.ArduinoPowerController.ArchitectureValidation\Dependency Validation.layerdiagram">
+      <Link>Dependency Validation.layerdiagram</Link>
+      <Visible>False</Visible>
+    </AdditionalFiles>
     <None Include="app.config" />
-    <None Include="packages.config" />
     <None Include="ReadMe.md" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="contributors.txt" />
+    <PackageReference Include="ASCOM.Platform">
+      <Version>6.5.2</Version>
+    </PackageReference>
+    <PackageReference Include="GitVersion.MsBuild">
+      <Version>5.9.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="NLog">
+      <Version>4.7.15</Version>
+    </PackageReference>
+    <PackageReference Include="PostSharp">
+      <Version>6.10.8</Version>
+    </PackageReference>
   </ItemGroup>
+  <Import Project="..\TA.ArduinoPowerController.SharedCode\TA.ArduinoPowerController.SharedCode.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\PostSharp.4.3.31\tools\PostSharp.targets" Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" />
-  <Target Name="EnsurePostSharpImported" BeforeTargets="BeforeBuild" Condition="'$(PostSharp30Imported)' == ''">
-    <Error Condition="!Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://www.postsharp.net/links/nuget-restore." />
-    <Error Condition="Exists('..\packages\PostSharp.4.3.31\tools\PostSharp.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://www.postsharp.net/links/nuget-restore." />
-  </Target>
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/TA.PostSharp.Aspects/app.config b/TA.PostSharp.Aspects/app.config
index 269c73d..3cea41b 100644
--- a/TA.PostSharp.Aspects/app.config
+++ b/TA.PostSharp.Aspects/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.30.0" newVersion="4.3.30.0" />
+        <assemblyIdentity name="PostSharp" publicKeyToken="b13fd38b8f9c99d7" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.3.30.0" newVersion="4.3.30.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/TA.PostSharp.Aspects/packages.config b/TA.PostSharp.Aspects/packages.config
deleted file mode 100644
index b0bda81..0000000
--- a/TA.PostSharp.Aspects/packages.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="ASCOM.Platform" version="6.3.0" targetFramework="net462" developmentDependency="true" />
-  <package id="NLog" version="4.4.5" targetFramework="net462" />
-  <package id="PostSharp" version="4.3.31" targetFramework="net462" />
-</packages>
\ No newline at end of file
diff --git a/images/hardware.png b/images/hardware.png
new file mode 100644
index 0000000..b795430
Binary files /dev/null and b/images/hardware.png differ