diff --git a/AstroMath.UnitTests/AstroMath.UnitTests.csproj b/AstroMath.UnitTests/AstroMath.UnitTests.csproj
index 2004ecf..009b162 100644
--- a/AstroMath.UnitTests/AstroMath.UnitTests.csproj
+++ b/AstroMath.UnitTests/AstroMath.UnitTests.csproj
@@ -24,7 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/FocuserTestConsole/FocuserTestConsole.csproj b/FocuserTestConsole/FocuserTestConsole.csproj
index 1067b3a..207d96f 100644
--- a/FocuserTestConsole/FocuserTestConsole.csproj
+++ b/FocuserTestConsole/FocuserTestConsole.csproj
@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
diff --git a/Meade.net.Setup/AscomFocuserDriver.wxs b/Meade.net.Setup/AscomFocuserDriver.wxs
new file mode 100644
index 0000000..a3db5e1
--- /dev/null
+++ b/Meade.net.Setup/AscomFocuserDriver.wxs
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)\Config.wxi?>
+  <!--
+    ASCOM Focuser Driver with COM registry entries suitable for a LocalServer Served Class
+  -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER" />
+<!--    <CustomActionRef Id="caPrepareAscomDeviceProfiles"/>
+    <CustomActionRef Id="caUnregisterDrivers"/>
+    <CustomActionRef Id="caRegisterDrivers"/>-->
+    <ComponentGroup Id="cgAscomFocuserDriver">
+      <ComponentGroupRef Id="cgAscomLocalServer" />
+      <Component Id="cmpAscomFocuserDriver"
+                 Directory="INSTALLFOLDER"
+                 Guid="*"
+                 Win64="no">
+        <File Id="filFocuserDriverAssembly"
+              Source="$(var.Meade.net.focuser.TargetPath)"
+              KeyPath="yes"
+              Vital="yes"
+              Assembly=".net"
+              AssemblyApplication="filFocuserDriverAssembly" />
+        <!-- Registry entries suitable for a LocalServer served class -->
+        <!-- HKCR\CLSID\{driver-guid} -->
+        <RegistryKey Root="HKCR" Key="CLSID">
+          <RegistryKey Key="$(var.FocuserDriverClassId)">
+            <RegistryValue Value="$(var.FocuserDriverProgId)" Type="string"/>
+            <RegistryValue Name="AppId" Value="$(var.LocalServerAppId)" Type="string"/>
+            <RegistryKey Key="Implemented Categories">
+              <RegistryKey Key="{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}"
+                           ForceCreateOnInstall="yes"
+                           ForceDeleteOnUninstall="yes"/>
+            </RegistryKey>
+            <RegistryKey Key="ProgId">
+              <RegistryValue Value="$(var.FocuserDriverProgId)" Type="string"/>
+            </RegistryKey>
+            <RegistryKey Key="Programmable"
+                         ForceCreateOnInstall="yes"
+                         ForceDeleteOnUninstall="yes" />
+            <RegistryKey Key="LocalServer32">
+              <RegistryValue Value="[#filLocalServerAssembly]" Type="string"/>
+            </RegistryKey>
+          </RegistryKey>
+        </RegistryKey>
+
+        <!-- HKCR\{driver-prog-id} -->
+        <RegistryKey Root="HKCR" Key="$(var.FocuserDriverProgId)">
+          <RegistryValue Value="$(var.FocuserDriverDescription)" Type="string"/>
+          <RegistryKey Key="CLSID">
+            <RegistryValue Value="$(var.FocuserDriverClassId)" Type="string" />
+          </RegistryKey>
+        </RegistryKey>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/Meade.net.Setup/AscomLocalServer.wxs b/Meade.net.Setup/AscomLocalServer.wxs
new file mode 100644
index 0000000..ccfc9c4
--- /dev/null
+++ b/Meade.net.Setup/AscomLocalServer.wxs
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)\Config.wxi?>
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER"/>
+    <ComponentGroup Id="cgAscomLocalServer" Directory="INSTALLFOLDER">
+      <Component Id="cmpAscomLocalServer" Guid="*" Win64="no">
+        <File Id="filLocalServerAssembly"
+              Source="$(var.Meade.net.TargetPath)"
+              KeyPath="yes"
+              Vital="yes"
+              Assembly=".net"
+              AssemblyApplication="filLocalServerAssembly" />
+      </Component>
+      <Component Id="cmpLocalServerRegistry" Win64="no">
+        <!-- LocalServer32 COM Registration -->
+        <RegistryKey Root="HKCR" Key="AppID" >
+          <!-- HKCR\AppID\{my-app-id} -->
+          <RegistryKey Key="$(var.LocalServerAppId)">
+            <RegistryValue Value="$(var.InstallName)" Type="string"/>
+            <RegistryValue Name="AppID" Value="$(var.LocalServerAppId)" Type="string"/>
+            <RegistryValue Name="AuthenticationLevel" Value="1" Type="integer"/>
+          </RegistryKey>
+          <!-- HKCR\AppID\{exe-name} -->
+          <RegistryKey Key="$(var.Meade.net.TargetFileName)">
+            <RegistryValue Name="AppID" Value="$(var.LocalServerAppId)" Type="string"/>
+          </RegistryKey>
+        </RegistryKey>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/Meade.net.Setup/AscomTelescopeDriver.wxs b/Meade.net.Setup/AscomTelescopeDriver.wxs
new file mode 100644
index 0000000..f2d561e
--- /dev/null
+++ b/Meade.net.Setup/AscomTelescopeDriver.wxs
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)\Config.wxi?>
+  <!--
+    ASCOM Telescope Driver with COM registry entries suitable for a LocalServer Served Class
+  -->
+  <Fragment>
+    <DirectoryRef Id="INSTALLFOLDER" />
+<!--    <CustomActionRef Id="caPrepareAscomDeviceProfiles"/>
+    <CustomActionRef Id="caUnregisterDrivers"/>
+    <CustomActionRef Id="caRegisterDrivers"/>-->
+    <ComponentGroup Id="cgAscomTelescopeDriver">
+      <ComponentGroupRef Id="cgAscomLocalServer" />
+      <Component Id="cmpAscomTelescopeDriver"
+                 Directory="INSTALLFOLDER"
+                 Guid="*"
+                 Win64="no">
+        <File Id="filTelescopeDriverAssembly"
+              Source="$(var.Meade.net.Telescope.TargetPath)"
+              KeyPath="yes"
+              Vital="yes"
+              Assembly=".net"
+              AssemblyApplication="filTelescopeDriverAssembly" />
+        <!-- Registry entries suitable for a LocalServer served class -->
+        <!-- HKCR\CLSID\{driver-guid} -->
+        <RegistryKey Root="HKCR" Key="CLSID">
+          <RegistryKey Key="$(var.TelescopeDriverClassId)">
+            <RegistryValue Value="$(var.TelescopeDriverProgId)" Type="string"/>
+            <RegistryValue Name="AppId" Value="$(var.LocalServerAppId)" Type="string"/>
+            <RegistryKey Key="Implemented Categories">
+              <RegistryKey Key="{62C8FE65-4EBB-45e7-B440-6E39B2CDBF29}"
+                           ForceCreateOnInstall="yes"
+                           ForceDeleteOnUninstall="yes"/>
+            </RegistryKey>
+            <RegistryKey Key="ProgId">
+              <RegistryValue Value="$(var.TelescopeDriverProgId)" Type="string"/>
+            </RegistryKey>
+            <RegistryKey Key="Programmable"
+                         ForceCreateOnInstall="yes"
+                         ForceDeleteOnUninstall="yes" />
+            <RegistryKey Key="LocalServer32">
+              <RegistryValue Value="[#filLocalServerAssembly]" Type="string"/>
+            </RegistryKey>
+          </RegistryKey>
+        </RegistryKey>
+
+        <!-- HKCR\{driver-prog-id} -->
+        <RegistryKey Root="HKCR" Key="$(var.TelescopeDriverProgId)">
+          <RegistryValue Value="$(var.TelescopeDriverDescription)" Type="string"/>
+          <RegistryKey Key="CLSID">
+            <RegistryValue Value="$(var.TelescopeDriverClassId)" Type="string" />
+          </RegistryKey>
+        </RegistryKey>
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/Meade.net.Setup/Config.wxi b/Meade.net.Setup/Config.wxi
new file mode 100644
index 0000000..5111470
--- /dev/null
+++ b/Meade.net.Setup/Config.wxi
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<Include>
+  <!--
+    User Configuration - you must ensure all these variables have correct values for your project. 
+    GUIDs specified here must match those used in the project files, and must be unique to this product.
+    The LocalServerAppId is defined in the Server project, in LocalServer.cs
+    Driver Class IDs are defined in each driver class, in the [Guid()] attribute.
+    Driver ProgIDs must match those used in the source code, typically this will be defined in the LocalServer
+    project as a constant in the SharedResources static class.
+    UpgradeCode must be unique to this product and should not be changed for the product lifetime.
+  -->
+
+  <?define InstallName = "ASCOM Meade.net" ?>
+  <?define Manufacturer = "cjdawson.com" ?>
+  <?define UpgradeCode = "{57597bb6-f207-4998-97f4-8a041950d062}" ?>
+  <?define INSTALLFOLDER = "$(var.InstallName)" ?>
+  
+  <?define LocalServerAppId = "{4e68ec46-5ffc-49e7-b298-38a548df0bfd}" ?>
+  <?define CopyrightNotice="Copyright © 2019 cjdawson.com, all rights reserved" ?>
+
+  <?define TelescopeDriverClassId="{8b9fccb9-87ae-42f7-90af-079e13de6efb}" ?>
+  <?define TelescopeDriverProgId="ASCOM.MeadeGeneric.Telescope" ?>
+  <?define TelescopeDriverDescription="Meade Generic"?>
+
+  <?define FocuserDriverClassId="{a32ac647-bf0f-42f9-8ab0-d166fa5884ad}" ?>
+  <?define FocuserDriverProgId="ASCOM.MeadeGeneric.focuser" ?>
+  <?define FocuserDriverDescription="Meade Generic" ?>
+
+  <!-- End of User Configuration - do not edit anything beyond this point -->
+
+  <!-- Define platform-specific names and locations -->
+  <?if $(var.Platform) = x64 ?>
+  <?define ProductName = "$(var.InstallName) (x64)" ?>
+  <?define Win64 = "yes" ?>
+  <?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
+  <?define PlatformCommonFilesFolder = "CommonFiles64Folder" ?>
+  <?else ?>
+  <?define ProductName = "$(var.InstallName) (x86)" ?>
+  <?define Win64 = "no" ?>
+  <?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
+  <?define PlatformCommonFilesFolder = "CommonFilesFolder" ?>
+  <?endif ?>
+
+  <!-- Set installer version based on the file version of the main assembly. -->
+  <!--<?define ProductVersion="!(bind.FileVersion.filLocalServerAssembly)"?>-->
+  <?define ProductVersion="0.5.0.0"?>
+</Include>
\ No newline at end of file
diff --git a/Meade.net.Setup/Directories.wxs b/Meade.net.Setup/Directories.wxs
new file mode 100644
index 0000000..435128a
--- /dev/null
+++ b/Meade.net.Setup/Directories.wxs
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)\Config.wxi?>
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="dirManufacturer" Name="$(var.Manufacturer)">
+          <Directory Id="INSTALLFOLDER" Name="$(var.InstallName)"/>
+        </Directory>
+      </Directory>
+    </Directory>
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/Meade.net.Setup/FeatureTree.wxs b/Meade.net.Setup/FeatureTree.wxs
new file mode 100644
index 0000000..602f994
--- /dev/null
+++ b/Meade.net.Setup/FeatureTree.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" >
+  <?include $(sys.CURRENTDIR)\Config.wxi?>
+  <Fragment>
+    <FeatureGroup Id="fgRoot" >
+      <Feature Id="featAscomDrivers" Title="ASCOM drivers" Level="1" Absent="disallow"
+               Display="expand" >
+        <ComponentGroupRef Id="cgAscomTelescopeDriver"/>
+        <ComponentGroupRef Id="cgAscomFocuserDriver"/>
+      </Feature>
+    </FeatureGroup>
+  </Fragment>
+</Wix>
\ No newline at end of file
diff --git a/Meade.net.Setup/InstallationUI.wxs b/Meade.net.Setup/InstallationUI.wxs
new file mode 100644
index 0000000..a52ab86
--- /dev/null
+++ b/Meade.net.Setup/InstallationUI.wxs
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+
+
+
+<!--
+First-time install dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_LicenseAgreementDlg
+ - WixUI_InstallDirDlg
+ - WixUI_VerifyReadyDlg
+ - WixUI_DiskCostDlg
+
+Maintenance dialog sequence:
+ - WixUI_MaintenanceWelcomeDlg
+ - WixUI_MaintenanceTypeDlg
+ - WixUI_InstallDirDlg
+ - WixUI_VerifyReadyDlg
+
+Patch dialog sequence:
+ - WixUI_WelcomeDlg
+ - WixUI_VerifyReadyDlg
+
+-->
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <UI Id="InstallationUI">
+      <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
+      <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
+      <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
+
+      <Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
+      <Property Id="WixUI_Mode" Value="InstallDir" />
+
+      <DialogRef Id="BrowseDlg" />
+      <DialogRef Id="DiskCostDlg" />
+      <DialogRef Id="ErrorDlg" />
+      <DialogRef Id="FatalError" />
+      <DialogRef Id="FilesInUse" />
+      <DialogRef Id="MsiRMFilesInUse" />
+      <DialogRef Id="PrepareDlg" />
+      <DialogRef Id="ProgressDlg" />
+      <DialogRef Id="ResumeDlg" />
+      <DialogRef Id="UserExit" />
+
+      <Publish Dialog="BrowseDlg" Control="OK" Event="DoAction" Value="WixUIValidatePath" Order="3">1</Publish>
+      <Publish Dialog="BrowseDlg" Control="OK" Event="SpawnDialog" Value="InvalidDirDlg" Order="4"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+
+      <Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999">1</Publish>
+
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">Installed AND PATCH</Publish>
+
+      <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg">1</Publish>
+      <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg">LicenseAccepted = "1"</Publish>
+
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="WixUIValidatePath" Order="2">NOT WIXUI_DONTVALIDATEPATH</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="SpawnDialog" Value="InvalidDirDlg" Order="3"><![CDATA[NOT WIXUI_DONTVALIDATEPATH AND WIXUI_INSTALLDIR_VALID<>"1"]]></Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="4">WIXUI_DONTVALIDATEPATH OR WIXUI_INSTALLDIR_VALID="1"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="1">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="2">1</Publish>
+
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1">NOT Installed</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2">Installed AND NOT PATCH</Publish>
+      <Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">Installed AND PATCH</Publish>
+
+      <Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+
+      <Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+      <Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
+
+      <Property Id="ARPNOMODIFY" Value="1" />
+    </UI>
+
+    <UIRef Id="WixUI_Common" />
+  </Fragment>
+</Wix>
diff --git a/Meade.net.Setup/Meade.net.Setup.wixproj b/Meade.net.Setup/Meade.net.Setup.wixproj
new file mode 100644
index 0000000..9f6c619
--- /dev/null
+++ b/Meade.net.Setup/Meade.net.Setup.wixproj
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>8eeb5c25-8394-4257-8e57-cded47cb6f1b</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>Meade.net.Setup</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DefineConstants>Debug</DefineConstants>
+    <OutputPath>bin\$(Configuration)\$(Platform)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="AscomLocalServer.wxs" />
+    <Compile Include="AscomTelescopeDriver.wxs" />
+    <Compile Include="AscomFocuserDriver.wxs" />
+    <Compile Include="Directories.wxs" />
+    <Compile Include="FeatureTree.wxs" />
+    <Compile Include="InstallationUI.wxs" />
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Config.wxi" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Meade.net.focuser\Meade.net.focuser.csproj">
+      <Name>Meade.net.focuser</Name>
+      <Project>{a97e3aec-f11d-49da-b259-de99da813a86}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\Meade.net.Telescope\Meade.net.Telescope.csproj">
+      <Name>Meade.net.Telescope</Name>
+      <Project>{64308775-bd4a-469c-bcab-3ed830b811af}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+    <ProjectReference Include="..\Meade.net\Meade.net.csproj">
+      <Name>Meade.net</Name>
+      <Project>{3689a2cb-94c5-4012-a5cf-7e7d1dd27143}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <!--
+	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.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/Meade.net.Setup/Product.wxs b/Meade.net.Setup/Product.wxs
new file mode 100644
index 0000000..bd324d6
--- /dev/null
+++ b/Meade.net.Setup/Product.wxs
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include $(sys.CURRENTDIR)\Config.wxi?>
+  <Product Id="*"
+           Name="$(var.InstallName)"
+           Language="1033"
+           Version="$(var.ProductVersion)"
+           Manufacturer="$(var.Manufacturer)"
+           UpgradeCode="$(var.UpgradeCode)">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+
+    <MediaTemplate EmbedCab="yes" />
+    
+    <Property Id="REGISTRYROOT" Value="Software\Cjdawson.com Ltd\Database Patcher" />
+
+    <PropertyRef Id="NETFRAMEWORK45" />
+    <Condition Message="This application requires .NET Framework 4.7.1. Please install the .NET Framework then run this installer again.">
+      <![CDATA[Installed OR NETFRAMEWORK45>="#461308"]]>
+    </Condition>
+
+    <!--todo create a method to check if ASCOM is installed.-->
+    <!--<Condition Message="This application requires ASCOM Platform 6.4 or later.  Please install this and try again.">
+      <![CDATA[Installed or WIX_IS_NETFRAMEWORK_471_OR_LATER_INSTALLED]]>
+    </Condition>-->
+
+    <Condition Message="Please use the correct installer for your operating system - x86 for 32-bit, x64 for 64-bit.">
+      <?if $(var.Win64) = "yes" ?>
+      VersionNT64
+      <?else?>
+      NOT VersionNT64
+      <?endif?>
+    </Condition>
+
+    
+    <UIRef Id="InstallationUI"/>
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+
+    <FeatureGroupRef Id="fgRoot"/>
+	</Product>
+</Wix>
diff --git a/Meade.net.Telescope/Meade.net.Telescope.csproj b/Meade.net.Telescope/Meade.net.Telescope.csproj
index 9e74b40..2a4e587 100644
--- a/Meade.net.Telescope/Meade.net.Telescope.csproj
+++ b/Meade.net.Telescope/Meade.net.Telescope.csproj
@@ -46,7 +46,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <RegisterForComInterop>true</RegisterForComInterop>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
diff --git a/Meade.net.Telescope/Properties/AssemblyInfo.cs b/Meade.net.Telescope/Properties/AssemblyInfo.cs
index e395e18..8e8df09 100644
--- a/Meade.net.Telescope/Properties/AssemblyInfo.cs
+++ b/Meade.net.Telescope/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 //
 // TODO - Set your driver's version here
-[assembly: AssemblyVersion("0.4.0.0")]
-[assembly: AssemblyFileVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]
+[assembly: AssemblyFileVersion("0.5.0.0")]
diff --git a/Meade.net.focuser/Meade.net.focuser.csproj b/Meade.net.focuser/Meade.net.focuser.csproj
index a082801..a033b82 100644
--- a/Meade.net.focuser/Meade.net.focuser.csproj
+++ b/Meade.net.focuser/Meade.net.focuser.csproj
@@ -46,7 +46,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <RegisterForComInterop>true</RegisterForComInterop>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
diff --git a/Meade.net.focuser/Properties/AssemblyInfo.cs b/Meade.net.focuser/Properties/AssemblyInfo.cs
index 0fce7a9..a02a8e6 100644
--- a/Meade.net.focuser/Properties/AssemblyInfo.cs
+++ b/Meade.net.focuser/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 //
 // TODO - Set your driver's version here
-[assembly: AssemblyVersion("0.4.0.0")]
-[assembly: AssemblyFileVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]
+[assembly: AssemblyFileVersion("0.5.0.0")]
diff --git a/Meade.net.sln b/Meade.net.sln
index 1c77465..03f950d 100644
--- a/Meade.net.sln
+++ b/Meade.net.sln
@@ -19,58 +19,92 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AstroMath.UnitTests", "AstroMath.UnitTests\AstroMath.UnitTests.csproj", "{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Meade.net.Setup", "Meade.net.Setup\Meade.net.Setup.wixproj", "{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}"
+EndProject
 Global
 	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
 		{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
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x64.Build.0 = Debug|Any CPU
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Debug|x86.Build.0 = Debug|Any CPU
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|x64.Build.0 = Release|Any CPU
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|x86.ActiveCfg = Release|Any CPU
 		{64308775-BD4A-469C-BCAB-3ED830B811AF}.Release|x86.Build.0 = Release|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x64.Build.0 = Debug|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Debug|x86.Build.0 = Debug|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|x64.ActiveCfg = Release|Any CPU
+		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|x64.Build.0 = Release|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|x86.ActiveCfg = Release|Any CPU
 		{A97E3AEC-F11D-49DA-B259-DE99DA813A86}.Release|x86.Build.0 = Release|Any CPU
 		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|x64.ActiveCfg = Debug|x86
 		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|x86.ActiveCfg = Debug|x86
 		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Debug|x86.Build.0 = Debug|x86
 		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Release|Any CPU.ActiveCfg = Release|x86
+		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Release|x64.ActiveCfg = Release|x86
 		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Release|x86.ActiveCfg = Release|x86
 		{D5207217-61C7-4E94-8097-91DBACE57D2A}.Release|x86.Build.0 = Release|x86
 		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|x64.ActiveCfg = Debug|x86
 		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|x86.ActiveCfg = Debug|x86
 		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Debug|x86.Build.0 = Debug|x86
 		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Release|Any CPU.ActiveCfg = Release|x86
+		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Release|x64.ActiveCfg = Release|x86
 		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Release|x86.ActiveCfg = Release|x86
 		{AABC96B8-C462-4B3A-9B5F-2929E3CB7A49}.Release|x86.Build.0 = Release|x86
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x64.Build.0 = Debug|Any CPU
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Debug|x86.Build.0 = Debug|Any CPU
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|x64.ActiveCfg = Release|Any CPU
+		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|x64.Build.0 = Release|Any CPU
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|x86.ActiveCfg = Release|Any CPU
 		{AD4959DD-33D7-4C3F-8DB0-7361D8E74A95}.Release|x86.Build.0 = Release|Any CPU
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|Any CPU.Build.0 = Debug|x64
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x64.ActiveCfg = Debug|x64
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x64.Build.0 = Debug|x64
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x86.ActiveCfg = Debug|x86
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Debug|x86.Build.0 = Debug|x86
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Release|Any CPU.ActiveCfg = Release|x86
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Release|x64.ActiveCfg = Release|x86
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Release|x86.ActiveCfg = Release|x86
+		{8EEB5C25-8394-4257-8E57-CDED47CB6F1B}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Meade.net/Meade.net.csproj b/Meade.net/Meade.net.csproj
index fa3e6a1..6b8ed95 100644
--- a/Meade.net/Meade.net.csproj
+++ b/Meade.net/Meade.net.csproj
@@ -40,9 +40,9 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>false</Prefer32Bit>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/Meade.net/Properties/AssemblyInfo.cs b/Meade.net/Properties/AssemblyInfo.cs
index af3da5d..9570023 100644
--- a/Meade.net/Properties/AssemblyInfo.cs
+++ b/Meade.net/Properties/AssemblyInfo.cs
@@ -21,7 +21,7 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.4.0.0")]
-[assembly: AssemblyFileVersion("0.4.0.0")]
+[assembly: AssemblyVersion("0.5.0.0")]
+[assembly: AssemblyFileVersion("0.5.0.0")]
 
 [assembly: ComVisibleAttribute(false)]
diff --git a/TelescopeTestConsole/TelescopeTestConsole.csproj b/TelescopeTestConsole/TelescopeTestConsole.csproj
index deb5415..61210c5 100644
--- a/TelescopeTestConsole/TelescopeTestConsole.csproj
+++ b/TelescopeTestConsole/TelescopeTestConsole.csproj
@@ -16,7 +16,7 @@
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>