diff --git a/LynxAstro.DewController.Switch.UnitTests/Properties/AssemblyInfo.cs b/LynxAstro.DewController.Switch.UnitTests/Properties/AssemblyInfo.cs
index 1573b92..eb6eb6c 100644
--- a/LynxAstro.DewController.Switch.UnitTests/Properties/AssemblyInfo.cs
+++ b/LynxAstro.DewController.Switch.UnitTests/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/LynxAstro.DewController.Switch/Switch.cs b/LynxAstro.DewController.Switch/Switch.cs
index 624101f..35573e3 100644
--- a/LynxAstro.DewController.Switch/Switch.cs
+++ b/LynxAstro.DewController.Switch/Switch.cs
@@ -2,7 +2,6 @@
 
 using System;
 using System.Runtime.InteropServices;
-using ASCOM.Utilities;
 using ASCOM.DeviceInterface;
 using System.Collections;
 using System.Collections.Generic;
@@ -28,7 +27,7 @@ namespace ASCOM.LynxAstro.DewController
     [ProgId("ASCOM.LynxAstro.DewController.Switch")]
     [ServedClassName("LynxAstro.DewController")]
     [ClassInterface(ClassInterfaceType.None)]
-    public class Switch : ISwitchV2
+    public class Switch : AscomDriverBase, ISwitchV2
     {
         /// <summary>
         /// ASCOM DeviceID (COM ProgID) for this driver.
@@ -36,48 +35,21 @@ namespace ASCOM.LynxAstro.DewController
         /// </summary>
         internal static string DriverId = Marshal.GenerateProgIdForType(MethodBase.GetCurrentMethod().DeclaringType ?? throw new System.InvalidOperationException());
 
-        /// <summary>
-        /// Driver description that displays in the ASCOM Chooser.
-        /// </summary>
-        private static string DriverDescription = "ASCOM Switch Driver for LynxAstro.DewController";
-
-        protected static string ComPort; // Variables to hold the currrent device configuration
-        protected static TraceLogger Tl;
-
-        protected readonly ISharedResourcesWrapper SharedResourcesWrapper;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="LynxAstro.DewController"/> class.
         /// Must be public for COM registration.
         /// </summary>
         /// <param name="tl"></param>
         public Switch()
-        {
-            SharedResourcesWrapper = new SharedResourcesWrapper();
-
+        { 
             Initialise(nameof(Switch));
         }
 
-        public Switch(ISharedResourcesWrapper sharedResourcesWrapper)
+        public Switch(ISharedResourcesWrapper sharedResourcesWrapper) : base (sharedResourcesWrapper)
         {
-            SharedResourcesWrapper = sharedResourcesWrapper;
-
             Initialise(nameof(Switch));
         }
-
-
-        protected void Initialise(string className)
-        {
-            Tl = new TraceLogger("", $"LynxAstro.DewController.{className}");
-
-            ReadProfile(); // Read device configuration from the ASCOM Profile store
-
-            IsConnected = false; // Initialise connected to false
-
-            LogMessage(className, "Completed initialisation");
-            LogMessage(className, $"Driver version: {DriverVersion}");
-        }
-
+        
         //
         // PUBLIC COM INTERFACE ISwitchV2 IMPLEMENTATION
         //
@@ -196,36 +168,6 @@ namespace ASCOM.LynxAstro.DewController
             }
         }
 
-        public string Description
-        {
-            get
-            {
-                Tl.LogMessage("Description Get", DriverDescription);
-                return DriverDescription;
-            }
-        }
-
-        public string DriverInfo
-        {
-            get
-            {
-                string driverInfo = $"{Description} .net driver. Version: {DriverVersion}";
-                LogMessage("DriverInfo Get", driverInfo);
-                return driverInfo;
-            }
-        }
-
-        public string DriverVersion
-        {
-            get
-            {
-                Version version = Assembly.GetExecutingAssembly().GetName().Version;
-                string driverVersion = $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
-                LogMessage("DriverVersion Get", driverVersion);
-                return driverVersion;
-            }
-        }
-
         public short InterfaceVersion
         {
             // set by the driver wizard
@@ -317,7 +259,7 @@ namespace ASCOM.LynxAstro.DewController
         public string GetSwitchDescription(short id)
         {
             Validate("GetSwitchDescription", id);
-            return "Control Knob";
+            return $"Channel {ChannelToLetter(id)}";
         }
 
         /// <summary>
@@ -638,8 +580,6 @@ namespace ASCOM.LynxAstro.DewController
 
         #endregion
 
-        protected bool IsConnected { get; set; }
-
         /// <summary>
         /// Use this function to throw an exception if we aren't connected to the hardware
         /// </summary>
@@ -651,24 +591,7 @@ namespace ASCOM.LynxAstro.DewController
                 throw new ASCOM.NotConnectedException(message);
             }
         }
-
-        /// <summary>
-        /// Read the device configuration from the ASCOM Profile store
-        /// </summary>
-        protected void ReadProfile()
-        {
-            var profileProperties = SharedResourcesWrapper.ReadProfile();
-            Tl.Enabled = profileProperties.TraceLogger;
-            ComPort = profileProperties.ComPort;
-
-            switchNames.Clear();
-            switchNames.AddRange(profileProperties.SwitchNames);
-
-            LogMessage("ReadProfile", $"Trace logger enabled: {Tl.Enabled}");
-            LogMessage("ReadProfile", $"Com Port: {ComPort}");
-
-        }
-
+    
         protected void WriteSwitchNames()
         {
             var profileProperties = SharedResourcesWrapper.ReadProfile();
@@ -678,18 +601,6 @@ namespace ASCOM.LynxAstro.DewController
 
             SharedResourcesWrapper.WriteProfile(profileProperties);
         }
-
-        /// <summary>
-        /// Log helper function that takes formatted strings and arguments
-        /// </summary>
-        /// <param name="identifier"></param>
-        /// <param name="message"></param>
-        /// <param name="args"></param>
-        internal void LogMessage(string identifier, string message, params object[] args)
-        {
-            var msg = string.Format(message, args);
-            Tl.LogMessage(identifier, msg);
-        }
         #endregion
     }
 }
diff --git a/LynxAstro.DewController.TestConsole/Program.cs b/LynxAstro.DewController.TestConsole/Program.cs
index e7787a2..b0dc9f2 100644
--- a/LynxAstro.DewController.TestConsole/Program.cs
+++ b/LynxAstro.DewController.TestConsole/Program.cs
@@ -9,9 +9,6 @@
 //#define UseChooser
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace ASCOM
 {
diff --git a/LynxAstro.DewController.TestConsole/Properties/AssemblyInfo.cs b/LynxAstro.DewController.TestConsole/Properties/AssemblyInfo.cs
index 3622a8c..ef157a8 100644
--- a/LynxAstro.DewController.TestConsole/Properties/AssemblyInfo.cs
+++ b/LynxAstro.DewController.TestConsole/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/LynxAstro.DewController.UnitTests/SharedResourcesUnitTests.cs b/LynxAstro.DewController.UnitTests/SharedResourcesUnitTests.cs
index db1d8ea..09eab88 100644
--- a/LynxAstro.DewController.UnitTests/SharedResourcesUnitTests.cs
+++ b/LynxAstro.DewController.UnitTests/SharedResourcesUnitTests.cs
@@ -130,12 +130,7 @@ namespace LynxAstro.DewController.UnitTests
 
             string ComPortDefault = "COM1";
             string TraceStateDefault = "false";
-            string GuideRateProfileNameDefault = "10.077939"; //67% of sidereal rate
-            string PrecisionDefault = "Unchanged";
-            string GuidingStyleDefault = "Auto";
-            string BacklashCompensationDefault = "3000";
-            string ReverseFocuserDiectionDefault = "true";
-
+            
             Mock<IProfileWrapper> profileWrapperMock = new Mock<IProfileWrapper>();
             profileWrapperMock.SetupAllProperties();
 
diff --git a/LynxAstro.DewController/AscomDriverBase.cs b/LynxAstro.DewController/AscomDriverBase.cs
new file mode 100644
index 0000000..3330a33
--- /dev/null
+++ b/LynxAstro.DewController/AscomDriverBase.cs
@@ -0,0 +1,120 @@
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using ASCOM.Utilities;
+
+namespace ASCOM.LynxAstro.DewController
+{
+    [ComVisible(false)]
+    public class AscomDriverBase : ReferenceCountedObjectBase
+    {
+        /// <summary>
+        /// Variable to hold the trace logger object (creates a diagnostic log file with information that you specify)
+        /// </summary>
+        protected static TraceLogger Tl;
+
+        /// <summary>
+        /// Driver description that displays in the ASCOM Chooser.
+        /// </summary>
+        protected static readonly string DriverDescription = "Meade Generic";
+
+        protected static string ComPort; // Variables to hold the currrent device configuration
+        
+        protected readonly ISharedResourcesWrapper SharedResourcesWrapper;
+
+        public AscomDriverBase()
+        {
+            SharedResourcesWrapper = new SharedResourcesWrapper();
+        }
+
+        public AscomDriverBase(ISharedResourcesWrapper sharedResourcesWrapper)
+        {
+            SharedResourcesWrapper = sharedResourcesWrapper;
+        }
+
+        protected void Initialise(string className)
+        {
+            Tl = new TraceLogger("", $"Meade.Generic.{className}");
+
+            ReadProfile(); // Read device configuration from the ASCOM Profile store
+
+            IsConnected = false; // Initialise connected to false
+
+            LogMessage(className, "Completed initialisation");
+            LogMessage(className, $"Driver version: {DriverVersion}");
+        }
+
+        /// <summary>
+        /// Read the device configuration from the ASCOM Profile store
+        /// </summary>
+        protected void ReadProfile()
+        {
+            var profileProperties = SharedResourcesWrapper.ReadProfile();
+            Tl.Enabled = profileProperties.TraceLogger;
+            ComPort = profileProperties.ComPort;
+            
+            LogMessage("ReadProfile", $"Trace logger enabled: {Tl.Enabled}");
+            LogMessage("ReadProfile", $"Com Port: {ComPort}");
+        }
+
+        /// <summary>
+        /// Log helper function that takes formatted strings and arguments
+        /// </summary>
+        /// <param name="identifier"></param>
+        /// <param name="message"></param>
+        /// <param name="args"></param>
+        public static void LogMessage(string identifier, string message, params object[] args)
+        {
+            var msg = string.Format(message, args);
+            Tl.LogMessage(identifier, msg);
+        }
+
+        /// <summary>
+        /// Returns true if there is a valid connection to the driver hardware
+        /// </summary>
+        protected bool IsConnected { get; set; }
+
+        public string Description
+        {
+            get
+            {
+                Tl.LogMessage("Description Get", DriverDescription);
+                return DriverDescription;
+            }
+        }
+
+        public string DriverInfo
+        {
+            get
+            {
+                string driverInfo = $"{Description} .net driver. Version: {DriverVersion}";
+                LogMessage("DriverInfo Get", driverInfo);
+                return driverInfo;
+            }
+        }
+
+        public string DriverVersion
+        {
+            get
+            {
+                Version version = Assembly.GetExecutingAssembly().GetName().Version;
+                string driverVersion = $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}";
+                LogMessage("DriverVersion Get", driverVersion);
+                return driverVersion;
+            }
+        }
+
+        #region ASCOM Registration
+
+        private static IProfileFactory _profileFactory;
+
+        public static IProfileFactory ProfileFactory
+        {
+            get => _profileFactory ?? (_profileFactory = new ProfileFactory());
+            set => _profileFactory = value;
+        }
+
+        #endregion
+
+    }
+}
\ No newline at end of file
diff --git a/LynxAstro.DewController/LynxAstro.DewController.csproj b/LynxAstro.DewController/LynxAstro.DewController.csproj
index ed3df9a..7edc12e 100644
--- a/LynxAstro.DewController/LynxAstro.DewController.csproj
+++ b/LynxAstro.DewController/LynxAstro.DewController.csproj
@@ -40,7 +40,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -116,6 +116,7 @@
     <Compile Include="IProfileWrapper.cs" />
     <Compile Include="ISharedResourcesWrapper.cs" />
     <Compile Include="LocalServer.cs" />
+    <Compile Include="AscomDriverBase.cs" />
     <Compile Include="ProfileFactory.cs" />
     <Compile Include="ProfileProperties.cs" />
     <Compile Include="ProfileWrapper.cs" />
diff --git a/LynxAstro.DewController/SharedResources.cs b/LynxAstro.DewController/SharedResources.cs
index a94085f..51cd224 100644
--- a/LynxAstro.DewController/SharedResources.cs
+++ b/LynxAstro.DewController/SharedResources.cs
@@ -19,7 +19,6 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using ASCOM.Utilities;
 using ASCOM.Utilities.Interfaces;
-using JetBrains.Annotations;
 
 namespace ASCOM.LynxAstro.DewController
 {