From 5d47b500e9cb8dc41e2c3ca816b5035bdea90eae Mon Sep 17 00:00:00 2001
From: xxbiohazrdxx <xxbiohazrdxx@users.noreply.github.com>
Date: Mon, 6 Dec 2021 10:04:48 -0500
Subject: [PATCH] Cleanup, convert ocntrol library to standard/core

---
 AmpAPI/AmpAPI.csproj                          |   9 +-
 AmpAPI/Hubs/AmpHub.cs                         |  14 +
 AmpAPI/Startup.cs                             |  14 +-
 AmpMonitor/AmpMonitor.csproj                  |   6 -
 AmpWeb/AmpWeb.csproj                          |   7 +
 AmpWeb/Controllers/SettingsController.cs      |  57 +++
 AmpWeb/Pages/Index.cshtml                     |   5 -
 AmpWeb/Services/AmplifierService.cs           |  33 +-
 AmpWeb/Settings/ApplicationSettings.cs        |   7 +-
 AmpWeb/Startup.cs                             |   2 +
 AmpWeb/appsettings.json                       | 156 ++++----
 AmplifierTests/AmplifierTests.csproj          |   6 -
 {MPRSGxZ => MPRSGxZ.backup}/AmplifierStack.cs |   0
 MPRSGxZ.backup/AnalysisReport.sarif           |  53 +++
 .../Commands/BaseCommand.cs                   |  10 +-
 .../Commands/Command.cs                       |   0
 MPRSGxZ.backup/Commands/CommandResponse.cs    |  37 ++
 .../Commands/CommandType.cs                   |   0
 .../Commands/QueryCommand.cs                  |   0
 .../Commands/SetCommand.cs                    |   0
 .../Enumerators/AmplifierType.cs              |   0
 .../Enumerators/ZoneLinkMode.cs               |   0
 .../Events/QueueCommandEvent.cs               |   0
 .../Events/QueueCommandEventArgs.cs           |   0
 .../Events/ZoneChangedEvent.cs                |   0
 .../Events/ZoneChangedEventArgs.cs            |   0
 .../AmplifierCountOutOfRangeException.cs      |   5 +-
 .../Exceptions/InvalidCommandException.cs     |   0
 .../Exceptions/ZoneAlreadyLinkedException.cs  |   8 +-
 .../ZoneCountOutOfRangeException.cs           |   5 +-
 .../Exceptions/ZoneNotEnabledException.cs     |   8 +-
 .../Exceptions/ZoneNotLinkedException.cs      |  11 +
 .../Hardware/Amplifier.cs                     |   0
 .../Hardware/Source.cs                        |   0
 {MPRSGxZ => MPRSGxZ.backup}/Hardware/Zone.cs  |  11 +-
 {MPRSGxZ => MPRSGxZ.backup}/MPRSGxZ.csproj    |   0
 .../Ports/IPAmplifierPort.cs                  |   0
 {MPRSGxZ => MPRSGxZ.backup}/Ports/IPort.cs    |   0
 .../Ports/SerialAmplifierPort.cs              |   0
 .../Ports/VirtualAmplifierPort.cs             |   0
 .../Properties/AssemblyInfo.cs                |   0
 MPRSGxZ.backup/upgrade.backup                 |   1 +
 MPRSGxZ.old/AmplifierStack.cs                 | 232 +++++++++++
 MPRSGxZ.old/Commands/BaseCommand.cs           |  32 ++
 MPRSGxZ.old/Commands/Command.cs               |  79 ++++
 MPRSGxZ.old/Commands/CommandResponse.cs       |  37 ++
 MPRSGxZ.old/Commands/CommandType.cs           |   8 +
 MPRSGxZ.old/Commands/QueryCommand.cs          |  14 +
 MPRSGxZ.old/Commands/SetCommand.cs            |  24 ++
 MPRSGxZ.old/Enumerators/AmplifierType.cs      |   8 +
 MPRSGxZ.old/Enumerators/ZoneLinkMode.cs       |   9 +
 MPRSGxZ.old/Events/QueueCommandEvent.cs       |   4 +
 MPRSGxZ.old/Events/QueueCommandEventArgs.cs   |  15 +
 MPRSGxZ.old/Events/ZoneChangedEvent.cs        |   4 +
 MPRSGxZ.old/Events/ZoneChangedEventArgs.cs    |  16 +
 .../AmplifierCountOutOfRangeException.cs      |   9 +
 .../Exceptions/InvalidCommandException.cs     |   9 +
 .../Exceptions/ZoneAlreadyLinkedException.cs  |  11 +
 .../ZoneCountOutOfRangeException.cs           |   9 +
 .../Exceptions/ZoneNotEnabledException.cs     |  11 +
 .../Exceptions/ZoneNotLinkedException.cs      |  11 +
 MPRSGxZ.old/Hardware/Amplifier.cs             |  48 +++
 MPRSGxZ.old/Hardware/Source.cs                |  16 +
 MPRSGxZ.old/Hardware/Zone.cs                  | 365 ++++++++++++++++++
 MPRSGxZ.old/MPRSGxZ.csproj                    |  26 ++
 MPRSGxZ.old/Ports/IPAmplifierPort.cs          |  98 +++++
 MPRSGxZ.old/Ports/IPort.cs                    |  11 +
 MPRSGxZ.old/Ports/SerialAmplifierPort.cs      |  78 ++++
 MPRSGxZ.old/Ports/VirtualAmplifierPort.cs     |  74 ++++
 MPRSGxZ.old/Properties/AssemblyInfo.cs        |  11 +
 MPRSGxZ.sln                                   |  18 +-
 MPRSGxZ/Commands/CommandResponse.cs           |  37 --
 MPRSGxZ/Exceptions/ZoneNotLinkedException.cs  |  15 -
 NewLib/AmplifierStack.cs                      | 232 +++++++++++
 NewLib/Commands/BaseCommand.cs                |  32 ++
 NewLib/Commands/Command.cs                    |  79 ++++
 NewLib/Commands/CommandResponse.cs            |  37 ++
 NewLib/Commands/CommandType.cs                |   8 +
 NewLib/Commands/QueryCommand.cs               |  14 +
 NewLib/Commands/SetCommand.cs                 |  24 ++
 NewLib/Enumerators/AmplifierType.cs           |   8 +
 NewLib/Enumerators/ZoneLinkMode.cs            |   9 +
 NewLib/Events/QueueCommandEvent.cs            |   4 +
 NewLib/Events/QueueCommandEventArgs.cs        |  15 +
 NewLib/Events/ZoneChangedEvent.cs             |   4 +
 NewLib/Events/ZoneChangedEventArgs.cs         |  16 +
 .../AmplifierCountOutOfRangeException.cs      |   9 +
 NewLib/Exceptions/InvalidCommandException.cs  |   9 +
 .../Exceptions/ZoneAlreadyLinkedException.cs  |  11 +
 .../ZoneCountOutOfRangeException.cs           |   9 +
 NewLib/Exceptions/ZoneNotEnabledException.cs  |  11 +
 NewLib/Exceptions/ZoneNotLinkedException.cs   |  11 +
 NewLib/Hardware/Amplifier.cs                  |  48 +++
 NewLib/Hardware/Source.cs                     |  16 +
 NewLib/Hardware/Zone.cs                       | 365 ++++++++++++++++++
 NewLib/MPRSGxZ.csproj                         |  11 +
 NewLib/Ports/IPAmplifierPort.cs               |  98 +++++
 NewLib/Ports/IPort.cs                         |  11 +
 NewLib/Ports/SerialAmplifierPort.cs           |  78 ++++
 NewLib/Ports/VirtualAmplifierPort.cs          |  74 ++++
 SimAmp/Class1.cs                              |  12 +
 SimAmp/Properties/AssemblyInfo.cs             |  36 ++
 SimAmp/SimAmp.csproj                          |  54 +++
 103 files changed, 2946 insertions(+), 203 deletions(-)
 create mode 100644 AmpAPI/Hubs/AmpHub.cs
 create mode 100644 AmpWeb/Controllers/SettingsController.cs
 rename {MPRSGxZ => MPRSGxZ.backup}/AmplifierStack.cs (100%)
 create mode 100644 MPRSGxZ.backup/AnalysisReport.sarif
 rename {MPRSGxZ => MPRSGxZ.backup}/Commands/BaseCommand.cs (82%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Commands/Command.cs (100%)
 create mode 100644 MPRSGxZ.backup/Commands/CommandResponse.cs
 rename {MPRSGxZ => MPRSGxZ.backup}/Commands/CommandType.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Commands/QueryCommand.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Commands/SetCommand.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Enumerators/AmplifierType.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Enumerators/ZoneLinkMode.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Events/QueueCommandEvent.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Events/QueueCommandEventArgs.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Events/ZoneChangedEvent.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Events/ZoneChangedEventArgs.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Exceptions/AmplifierCountOutOfRangeException.cs (63%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Exceptions/InvalidCommandException.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Exceptions/ZoneAlreadyLinkedException.cs (72%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Exceptions/ZoneCountOutOfRangeException.cs (64%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Exceptions/ZoneNotEnabledException.cs (73%)
 create mode 100644 MPRSGxZ.backup/Exceptions/ZoneNotLinkedException.cs
 rename {MPRSGxZ => MPRSGxZ.backup}/Hardware/Amplifier.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Hardware/Source.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Hardware/Zone.cs (97%)
 rename {MPRSGxZ => MPRSGxZ.backup}/MPRSGxZ.csproj (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Ports/IPAmplifierPort.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Ports/IPort.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Ports/SerialAmplifierPort.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Ports/VirtualAmplifierPort.cs (100%)
 rename {MPRSGxZ => MPRSGxZ.backup}/Properties/AssemblyInfo.cs (100%)
 create mode 100644 MPRSGxZ.backup/upgrade.backup
 create mode 100644 MPRSGxZ.old/AmplifierStack.cs
 create mode 100644 MPRSGxZ.old/Commands/BaseCommand.cs
 create mode 100644 MPRSGxZ.old/Commands/Command.cs
 create mode 100644 MPRSGxZ.old/Commands/CommandResponse.cs
 create mode 100644 MPRSGxZ.old/Commands/CommandType.cs
 create mode 100644 MPRSGxZ.old/Commands/QueryCommand.cs
 create mode 100644 MPRSGxZ.old/Commands/SetCommand.cs
 create mode 100644 MPRSGxZ.old/Enumerators/AmplifierType.cs
 create mode 100644 MPRSGxZ.old/Enumerators/ZoneLinkMode.cs
 create mode 100644 MPRSGxZ.old/Events/QueueCommandEvent.cs
 create mode 100644 MPRSGxZ.old/Events/QueueCommandEventArgs.cs
 create mode 100644 MPRSGxZ.old/Events/ZoneChangedEvent.cs
 create mode 100644 MPRSGxZ.old/Events/ZoneChangedEventArgs.cs
 create mode 100644 MPRSGxZ.old/Exceptions/AmplifierCountOutOfRangeException.cs
 create mode 100644 MPRSGxZ.old/Exceptions/InvalidCommandException.cs
 create mode 100644 MPRSGxZ.old/Exceptions/ZoneAlreadyLinkedException.cs
 create mode 100644 MPRSGxZ.old/Exceptions/ZoneCountOutOfRangeException.cs
 create mode 100644 MPRSGxZ.old/Exceptions/ZoneNotEnabledException.cs
 create mode 100644 MPRSGxZ.old/Exceptions/ZoneNotLinkedException.cs
 create mode 100644 MPRSGxZ.old/Hardware/Amplifier.cs
 create mode 100644 MPRSGxZ.old/Hardware/Source.cs
 create mode 100644 MPRSGxZ.old/Hardware/Zone.cs
 create mode 100644 MPRSGxZ.old/MPRSGxZ.csproj
 create mode 100644 MPRSGxZ.old/Ports/IPAmplifierPort.cs
 create mode 100644 MPRSGxZ.old/Ports/IPort.cs
 create mode 100644 MPRSGxZ.old/Ports/SerialAmplifierPort.cs
 create mode 100644 MPRSGxZ.old/Ports/VirtualAmplifierPort.cs
 create mode 100644 MPRSGxZ.old/Properties/AssemblyInfo.cs
 delete mode 100644 MPRSGxZ/Commands/CommandResponse.cs
 delete mode 100644 MPRSGxZ/Exceptions/ZoneNotLinkedException.cs
 create mode 100644 NewLib/AmplifierStack.cs
 create mode 100644 NewLib/Commands/BaseCommand.cs
 create mode 100644 NewLib/Commands/Command.cs
 create mode 100644 NewLib/Commands/CommandResponse.cs
 create mode 100644 NewLib/Commands/CommandType.cs
 create mode 100644 NewLib/Commands/QueryCommand.cs
 create mode 100644 NewLib/Commands/SetCommand.cs
 create mode 100644 NewLib/Enumerators/AmplifierType.cs
 create mode 100644 NewLib/Enumerators/ZoneLinkMode.cs
 create mode 100644 NewLib/Events/QueueCommandEvent.cs
 create mode 100644 NewLib/Events/QueueCommandEventArgs.cs
 create mode 100644 NewLib/Events/ZoneChangedEvent.cs
 create mode 100644 NewLib/Events/ZoneChangedEventArgs.cs
 create mode 100644 NewLib/Exceptions/AmplifierCountOutOfRangeException.cs
 create mode 100644 NewLib/Exceptions/InvalidCommandException.cs
 create mode 100644 NewLib/Exceptions/ZoneAlreadyLinkedException.cs
 create mode 100644 NewLib/Exceptions/ZoneCountOutOfRangeException.cs
 create mode 100644 NewLib/Exceptions/ZoneNotEnabledException.cs
 create mode 100644 NewLib/Exceptions/ZoneNotLinkedException.cs
 create mode 100644 NewLib/Hardware/Amplifier.cs
 create mode 100644 NewLib/Hardware/Source.cs
 create mode 100644 NewLib/Hardware/Zone.cs
 create mode 100644 NewLib/MPRSGxZ.csproj
 create mode 100644 NewLib/Ports/IPAmplifierPort.cs
 create mode 100644 NewLib/Ports/IPort.cs
 create mode 100644 NewLib/Ports/SerialAmplifierPort.cs
 create mode 100644 NewLib/Ports/VirtualAmplifierPort.cs
 create mode 100644 SimAmp/Class1.cs
 create mode 100644 SimAmp/Properties/AssemblyInfo.cs
 create mode 100644 SimAmp/SimAmp.csproj

diff --git a/AmpAPI/AmpAPI.csproj b/AmpAPI/AmpAPI.csproj
index 79617d7..f32566b 100644
--- a/AmpAPI/AmpAPI.csproj
+++ b/AmpAPI/AmpAPI.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -9,14 +10,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.1.1" />
-    <PackageReference Include="System.IO.Ports" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MPRSGxZ\MPRSGxZ.csproj" />
+    <ProjectReference Include="..\NewLib\MPRSGxZ.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/AmpAPI/Hubs/AmpHub.cs b/AmpAPI/Hubs/AmpHub.cs
new file mode 100644
index 0000000..ba6ed4d
--- /dev/null
+++ b/AmpAPI/Hubs/AmpHub.cs
@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.SignalR;
+using System.Threading.Tasks;
+using AmpAPI.Models;
+
+namespace AmpApi.Hubs
+{
+    public class AmpHub : Hub
+    {
+        public async Task SendZoneUpdate(ZoneModel Zone)
+        {
+            await Clients.All.SendAsync("ReceiveZoneUpdate", Zone);
+        }
+    }
+}
\ No newline at end of file
diff --git a/AmpAPI/Startup.cs b/AmpAPI/Startup.cs
index 365b787..32c1528 100644
--- a/AmpAPI/Startup.cs
+++ b/AmpAPI/Startup.cs
@@ -3,8 +3,10 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace AmpAPI
 {
@@ -23,11 +25,12 @@ public void ConfigureServices(IServiceCollection services)
 			services.Configure<AmplifierStackSettings>(Configuration.GetSection("AmplifierStackSettings"));
 			services.AddSingleton<IAmplifierService, AmplifierService>();
 			//services.AddSingleton<IConfiguration>(Configuration);
-			services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+			services.AddRazorPages();
+			//services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
 		}
 
 		// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-		public void Configure(IApplicationBuilder app, IHostingEnvironment env)
+		public void Configure(IApplicationBuilder app, IHostEnvironment env)
 		{
 			if (env.IsDevelopment())
 			{
@@ -39,7 +42,12 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 			}
 
 			app.UseHttpsRedirection();
-			app.UseMvc();
+			app.UseRouting();
+			//app.UseAuthorization();
+			app.UseEndpoints(endpoints =>
+			{
+				endpoints.MapRazorPages();
+			});
 		}
 	}
 }
diff --git a/AmpMonitor/AmpMonitor.csproj b/AmpMonitor/AmpMonitor.csproj
index d31d36f..9912460 100644
--- a/AmpMonitor/AmpMonitor.csproj
+++ b/AmpMonitor/AmpMonitor.csproj
@@ -50,12 +50,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MPRSGxZ\MPRSGxZ.csproj">
-      <Project>{9f947c76-0ff2-4bbf-bd94-5afe9d0fa8a4}</Project>
-      <Name>MPRSGxZ</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/AmpWeb/AmpWeb.csproj b/AmpWeb/AmpWeb.csproj
index a276ed4..00f16ee 100644
--- a/AmpWeb/AmpWeb.csproj
+++ b/AmpWeb/AmpWeb.csproj
@@ -7,7 +7,14 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.9.5" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AmpWeb/Controllers/SettingsController.cs b/AmpWeb/Controllers/SettingsController.cs
new file mode 100644
index 0000000..5dfc36b
--- /dev/null
+++ b/AmpWeb/Controllers/SettingsController.cs
@@ -0,0 +1,57 @@
+using AmpWeb.Services;
+using AmpWeb.Settings;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
+using MPRSGxZ.Hardware;
+using System.Collections.Generic;
+
+
+namespace AmpWeb.Controllers
+{
+    [Route("api/[controller]")]
+    [ApiController]
+    public class SettingsController : ControllerBase
+    {
+		private AmplifierStackSettings Settings;
+		private IAmplifierService AmplifierService;
+
+		public SettingsController(IOptions<AmplifierStackSettings> Settings, IAmplifierService AmplifierService)
+		{
+			this.Settings = Settings.Value;
+			this.AmplifierService = AmplifierService;
+		}
+
+		// GET: api/Settings
+		[HttpGet]
+		[ProducesResponseType(StatusCodes.Status200OK)]
+        public IActionResult Get()
+        {
+			return Ok(Settings);
+		}
+
+        // POST: api/Settings
+        [HttpPost]
+		[ProducesResponseType(StatusCodes.Status405MethodNotAllowed)]
+        public IActionResult Post([FromBody] string value)
+        {
+			return StatusCode(StatusCodes.Status405MethodNotAllowed);
+        }
+
+        // PUT: api/Settings/5
+        [HttpPut]
+		[ProducesResponseType(StatusCodes.Status200OK)]
+		[ProducesResponseType(StatusCodes.Status400BadRequest)]
+		public void Put([FromBody] string value)
+        {
+        }
+
+        // DELETE: api/ApiWithActions/5
+        [HttpDelete("{id}")]
+		[ProducesResponseType(StatusCodes.Status405MethodNotAllowed)]
+		public IActionResult Delete(int id)
+        {
+			return StatusCode(StatusCodes.Status405MethodNotAllowed);
+		}
+    }
+}
diff --git a/AmpWeb/Pages/Index.cshtml b/AmpWeb/Pages/Index.cshtml
index 9b817e5..3379e70 100644
--- a/AmpWeb/Pages/Index.cshtml
+++ b/AmpWeb/Pages/Index.cshtml
@@ -140,8 +140,3 @@
 
 </body>
 </html>
-
-@page
-@model AmpWeb.Pages.IndexModel
-@{
-}
diff --git a/AmpWeb/Services/AmplifierService.cs b/AmpWeb/Services/AmplifierService.cs
index 8da4443..0ef363d 100644
--- a/AmpWeb/Services/AmplifierService.cs
+++ b/AmpWeb/Services/AmplifierService.cs
@@ -25,24 +25,43 @@ public Source[] Sources
 				return AmplifierMiddleware.Sources;
 			}
 		}
-		private AmplifierStackSettings Settings;
+		private AmplifierStackSettings _Settings;
 
 		public AmplifierService(IOptions<AmplifierStackSettings> Settings)
 		{
-			this.Settings = Settings.Value;
+			_Settings = Settings.Value;
 
-			if (this.Settings.PortType == ConnectionType.Virtual)
+			if (_Settings.PortType == ConnectionType.Virtual)
 			{
-				AmplifierMiddleware = new AmplifierStack(this.Settings.PollingFrequency, this.Settings.AmplifierCount);
+				AmplifierMiddleware = new AmplifierStack(_Settings.PollingFrequency, _Settings.AmplifierCount);
 			}
-			else if (this.Settings.PortType == ConnectionType.Serial)
+			else if (_Settings.PortType == ConnectionType.Serial)
 			{
-				AmplifierMiddleware = new AmplifierStack(this.Settings.PortAddress, this.Settings.PollingFrequency, this.Settings.AmplifierCount);
+				AmplifierMiddleware = new AmplifierStack(_Settings.PortAddress, _Settings.PollingFrequency, _Settings.AmplifierCount);
 			}
-			else
+			else if (_Settings.PortType == ConnectionType.IP)
 			{
 				throw new NotImplementedException();
 			}
+			else
+			{
+				throw new InvalidOperationException();
+			}
+
+			for (int i = 0; i < 6; i++)
+			{
+				AmplifierMiddleware.Sources[i].Enabled = _Settings.Sources[i].Enabled;
+				AmplifierMiddleware.Sources[i].Name = _Settings.Sources[i].Name;
+			}
+			
+			for (int i = 0; i < _Settings.AmplifierCount; i++)
+			{
+				for (int j = 0; j < 6; j++)
+				{
+					AmplifierMiddleware.Amplifiers[i].Zones[j].Enabled = _Settings.Amplifiers[i].Zones[j].Enabled;
+					AmplifierMiddleware.Amplifiers[i].Zones[j].Name = _Settings.Amplifiers[i].Zones[j].Name;
+				}
+			}
 
 			AmplifierMiddleware.Open();
 		}
diff --git a/AmpWeb/Settings/ApplicationSettings.cs b/AmpWeb/Settings/ApplicationSettings.cs
index efdea55..0b80848 100644
--- a/AmpWeb/Settings/ApplicationSettings.cs
+++ b/AmpWeb/Settings/ApplicationSettings.cs
@@ -6,10 +6,15 @@ public class AmplifierStackSettings
 		public string PortAddress { get; set; }
 		public int PollingFrequency { get; set; }
 		public int AmplifierCount { get; set; }
-		public ZoneSettings[] Zones { get; set; }
+		public AmplifierSettings[] Amplifiers { get; set; }
 		public SourceSettings[] Sources { get; set; }
 	}
 
+	public class AmplifierSettings
+	{
+		public ZoneSettings[] Zones { get; set; }
+	}
+
 	public class ZoneSettings
 	{
 		public string Name { get; set; }
diff --git a/AmpWeb/Startup.cs b/AmpWeb/Startup.cs
index 8fcca35..48c1215 100644
--- a/AmpWeb/Startup.cs
+++ b/AmpWeb/Startup.cs
@@ -49,10 +49,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapHub<AmpHub>("/amp");
+
                 endpoints.MapGet("/", async context =>
                 {
                     await context.Response.WriteAsync("Hello World!");
                 });
+
                 endpoints.MapControllerRoute("api", "{controller=Amplifier}/{action=Get}/{id?}");
             });
         }
diff --git a/AmpWeb/appsettings.json b/AmpWeb/appsettings.json
index 862ea0a..d63f11e 100644
--- a/AmpWeb/appsettings.json
+++ b/AmpWeb/appsettings.json
@@ -9,78 +9,90 @@
     "PortAddress": "",
     "PollingFrequency": 250,
     "AmplifierCount": 1,
-    "Zones": [
-      {
-        "Name": "Zone 1",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 2",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 3",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 4",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 5",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 6",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 7",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 8",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 9",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 10",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 11",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 12",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 13",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 14",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 15",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 16",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 17",
-        "Enabled": true
-      },
-      {
-        "Name": "Zone 18",
-        "Enabled": true
+    "Amplifiers": [
+      {
+        "Zones": [
+          {
+            "Name": "Zone 1",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 2",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 3",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 4",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 5",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 6",
+            "Enabled": true
+          }
+        ]
+      },
+      {
+        "Zones": [
+          {
+            "Name": "Zone 7",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 8",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 9",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 10",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 11",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 12",
+            "Enabled": true
+          }
+        ]
+      },
+      {
+        "Zones": [
+          {
+            "Name": "Zone 13",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 14",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 15",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 16",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 17",
+            "Enabled": true
+          },
+          {
+            "Name": "Zone 18",
+            "Enabled": true
+          }
+        ]
       }
     ],
     "Sources": [
diff --git a/AmplifierTests/AmplifierTests.csproj b/AmplifierTests/AmplifierTests.csproj
index 1ea804e..f6e822d 100644
--- a/AmplifierTests/AmplifierTests.csproj
+++ b/AmplifierTests/AmplifierTests.csproj
@@ -59,12 +59,6 @@
     <Compile Include="LinkedZoneTests.cs" />
     <Compile Include="EventTests.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\MPRSGxZ\MPRSGxZ.csproj">
-      <Project>{9f947c76-0ff2-4bbf-bd94-5afe9d0fa8a4}</Project>
-      <Name>MPRSGxZ</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>
diff --git a/MPRSGxZ/AmplifierStack.cs b/MPRSGxZ.backup/AmplifierStack.cs
similarity index 100%
rename from MPRSGxZ/AmplifierStack.cs
rename to MPRSGxZ.backup/AmplifierStack.cs
diff --git a/MPRSGxZ.backup/AnalysisReport.sarif b/MPRSGxZ.backup/AnalysisReport.sarif
new file mode 100644
index 0000000..445364f
--- /dev/null
+++ b/MPRSGxZ.backup/AnalysisReport.sarif
@@ -0,0 +1,53 @@
+{
+  "$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.5.json",
+  "version": "2.1.0",
+  "runs": [
+    {
+      "tool": {
+        "driver": {
+          "name": "Dependency Analysis",
+          "semanticVersion": "0.3.256001",
+          "informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview",
+          "rules": [
+            {
+              "id": "UA101",
+              "fullDescription": {
+                "text": "Dependency Analysis"
+              }
+            }
+          ]
+        }
+      },
+      "results": [
+        {
+          "ruleId": "UA101",
+          "message": {
+            "text": "Package Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.3.256001 needs to be added "
+          },
+          "locations": [
+            {
+              "physicalLocation": {
+                "artifactLocation": {
+                  "uri": "file:///C:/Users/Randy/source/repos/xxbiohazrdxx/MPRSGxZ/MPRSGxZ/MPRSGxZ.csproj"
+                },
+                "region": {}
+              }
+            }
+          ]
+        }
+      ],
+      "columnKind": "utf16CodeUnits"
+    },
+    {
+      "tool": {
+        "driver": {
+          "name": "API Upgradability",
+          "semanticVersion": "0.3.256001",
+          "informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
+        }
+      },
+      "results": [],
+      "columnKind": "utf16CodeUnits"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/MPRSGxZ/Commands/BaseCommand.cs b/MPRSGxZ.backup/Commands/BaseCommand.cs
similarity index 82%
rename from MPRSGxZ/Commands/BaseCommand.cs
rename to MPRSGxZ.backup/Commands/BaseCommand.cs
index 2e9db77..4d9e182 100644
--- a/MPRSGxZ/Commands/BaseCommand.cs
+++ b/MPRSGxZ.backup/Commands/BaseCommand.cs
@@ -2,11 +2,11 @@
 {
 	internal class BaseCommand
 	{
-		public int MinValue { get; private set; }
-		public int MaxValue { get; private set; }
-		public int AmpID { get; internal set; }
-		public int ZoneID { get; internal set; }
-		public int Value { get; internal set; }
+		public int MinValue		 { get; private set; }
+		public int MaxValue		 { get; private set; }
+		public int AmpID		 { get; internal set; }
+		public int ZoneID		 { get; internal set; }
+		public int Value		 { get; internal set; }
 		public int ExpectedLines { get; internal set; }
 
 		internal BaseCommand(int MinValue, int MaxValue)
diff --git a/MPRSGxZ/Commands/Command.cs b/MPRSGxZ.backup/Commands/Command.cs
similarity index 100%
rename from MPRSGxZ/Commands/Command.cs
rename to MPRSGxZ.backup/Commands/Command.cs
diff --git a/MPRSGxZ.backup/Commands/CommandResponse.cs b/MPRSGxZ.backup/Commands/CommandResponse.cs
new file mode 100644
index 0000000..5a4968e
--- /dev/null
+++ b/MPRSGxZ.backup/Commands/CommandResponse.cs
@@ -0,0 +1,37 @@
+namespace MPRSGxZ.Commands
+{
+	internal class CommandResponse
+	{
+		public int AmpID			{ get; private set; }
+		public int ZoneID			{ get; private set; }
+		public bool PublicAddress	{ get; private set; }
+		public bool Power			{ get; private set; }
+		public bool Mute			{ get; private set; }
+		public bool DoNotDisturb	{ get; private set; }
+		public int Volume			{ get; private set; }
+		public int Treble			{ get; private set; }
+		public int Bass				{ get; private set; }
+		public int Balance			{ get; private set; }
+		public int Source			{ get; private set; }
+
+		internal CommandResponse(string Response)
+		{
+			AmpID			= int.Parse(Response.Substring(0, 1));
+			ZoneID			= int.Parse(Response.Substring(1, 1));
+			PublicAddress	= int.Parse(Response.Substring(2, 2)) == 1 ? true : false;
+			Power			= int.Parse(Response.Substring(4, 2)) == 1 ? true : false;
+			Mute			= int.Parse(Response.Substring(6, 2)) == 1 ? true : false;
+			DoNotDisturb	= int.Parse(Response.Substring(8, 2)) == 1 ? true : false;
+			Volume			= int.Parse(Response.Substring(10, 2));
+			Treble			= int.Parse(Response.Substring(12, 2));
+			Bass			= int.Parse(Response.Substring(14, 2));
+			Balance			= int.Parse(Response.Substring(16, 2));
+			Source			= int.Parse(Response.Substring(18, 2));
+		}
+
+		public static implicit operator string(CommandResponse Response)
+		{
+			return $"{Response.AmpID:D1}{Response.ZoneID:D1}{(Response.PublicAddress ? 1 : 0):D2}{(Response.Power ? 1 : 0):D2}{(Response.Mute ? 1 : 0):D2}{(Response.DoNotDisturb ? 1 : 0):D2}{Response.Volume:D2}{Response.Treble:D2}{Response.Bass:D2}{Response.Balance:D2}{Response.Source:D2}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ/Commands/CommandType.cs b/MPRSGxZ.backup/Commands/CommandType.cs
similarity index 100%
rename from MPRSGxZ/Commands/CommandType.cs
rename to MPRSGxZ.backup/Commands/CommandType.cs
diff --git a/MPRSGxZ/Commands/QueryCommand.cs b/MPRSGxZ.backup/Commands/QueryCommand.cs
similarity index 100%
rename from MPRSGxZ/Commands/QueryCommand.cs
rename to MPRSGxZ.backup/Commands/QueryCommand.cs
diff --git a/MPRSGxZ/Commands/SetCommand.cs b/MPRSGxZ.backup/Commands/SetCommand.cs
similarity index 100%
rename from MPRSGxZ/Commands/SetCommand.cs
rename to MPRSGxZ.backup/Commands/SetCommand.cs
diff --git a/MPRSGxZ/Enumerators/AmplifierType.cs b/MPRSGxZ.backup/Enumerators/AmplifierType.cs
similarity index 100%
rename from MPRSGxZ/Enumerators/AmplifierType.cs
rename to MPRSGxZ.backup/Enumerators/AmplifierType.cs
diff --git a/MPRSGxZ/Enumerators/ZoneLinkMode.cs b/MPRSGxZ.backup/Enumerators/ZoneLinkMode.cs
similarity index 100%
rename from MPRSGxZ/Enumerators/ZoneLinkMode.cs
rename to MPRSGxZ.backup/Enumerators/ZoneLinkMode.cs
diff --git a/MPRSGxZ/Events/QueueCommandEvent.cs b/MPRSGxZ.backup/Events/QueueCommandEvent.cs
similarity index 100%
rename from MPRSGxZ/Events/QueueCommandEvent.cs
rename to MPRSGxZ.backup/Events/QueueCommandEvent.cs
diff --git a/MPRSGxZ/Events/QueueCommandEventArgs.cs b/MPRSGxZ.backup/Events/QueueCommandEventArgs.cs
similarity index 100%
rename from MPRSGxZ/Events/QueueCommandEventArgs.cs
rename to MPRSGxZ.backup/Events/QueueCommandEventArgs.cs
diff --git a/MPRSGxZ/Events/ZoneChangedEvent.cs b/MPRSGxZ.backup/Events/ZoneChangedEvent.cs
similarity index 100%
rename from MPRSGxZ/Events/ZoneChangedEvent.cs
rename to MPRSGxZ.backup/Events/ZoneChangedEvent.cs
diff --git a/MPRSGxZ/Events/ZoneChangedEventArgs.cs b/MPRSGxZ.backup/Events/ZoneChangedEventArgs.cs
similarity index 100%
rename from MPRSGxZ/Events/ZoneChangedEventArgs.cs
rename to MPRSGxZ.backup/Events/ZoneChangedEventArgs.cs
diff --git a/MPRSGxZ/Exceptions/AmplifierCountOutOfRangeException.cs b/MPRSGxZ.backup/Exceptions/AmplifierCountOutOfRangeException.cs
similarity index 63%
rename from MPRSGxZ/Exceptions/AmplifierCountOutOfRangeException.cs
rename to MPRSGxZ.backup/Exceptions/AmplifierCountOutOfRangeException.cs
index 7d3af19..5585f62 100644
--- a/MPRSGxZ/Exceptions/AmplifierCountOutOfRangeException.cs
+++ b/MPRSGxZ.backup/Exceptions/AmplifierCountOutOfRangeException.cs
@@ -4,9 +4,6 @@ namespace MPRSGxZ.Exceptions
 {
 	class AmplifierCountOutOfRangeException : Exception
 	{
-		public AmplifierCountOutOfRangeException() : base()
-		{
-
-		}
+		public AmplifierCountOutOfRangeException() : base() { }
 	}
 }
\ No newline at end of file
diff --git a/MPRSGxZ/Exceptions/InvalidCommandException.cs b/MPRSGxZ.backup/Exceptions/InvalidCommandException.cs
similarity index 100%
rename from MPRSGxZ/Exceptions/InvalidCommandException.cs
rename to MPRSGxZ.backup/Exceptions/InvalidCommandException.cs
diff --git a/MPRSGxZ/Exceptions/ZoneAlreadyLinkedException.cs b/MPRSGxZ.backup/Exceptions/ZoneAlreadyLinkedException.cs
similarity index 72%
rename from MPRSGxZ/Exceptions/ZoneAlreadyLinkedException.cs
rename to MPRSGxZ.backup/Exceptions/ZoneAlreadyLinkedException.cs
index 9dc64c2..27ed810 100644
--- a/MPRSGxZ/Exceptions/ZoneAlreadyLinkedException.cs
+++ b/MPRSGxZ.backup/Exceptions/ZoneAlreadyLinkedException.cs
@@ -4,12 +4,8 @@ namespace MPRSGxZ.Exceptions
 {
 	public class ZoneAlreadyLinkedException : Exception
 	{
-		public ZoneAlreadyLinkedException() : base()
-		{
-		}
+		public ZoneAlreadyLinkedException() : base() { }
 
-		public ZoneAlreadyLinkedException(string message) : base(message)
-		{
-		}
+		public ZoneAlreadyLinkedException(string message) : base(message) {	}
 	}
 }
\ No newline at end of file
diff --git a/MPRSGxZ/Exceptions/ZoneCountOutOfRangeException.cs b/MPRSGxZ.backup/Exceptions/ZoneCountOutOfRangeException.cs
similarity index 64%
rename from MPRSGxZ/Exceptions/ZoneCountOutOfRangeException.cs
rename to MPRSGxZ.backup/Exceptions/ZoneCountOutOfRangeException.cs
index 4f1b98c..79aadd5 100644
--- a/MPRSGxZ/Exceptions/ZoneCountOutOfRangeException.cs
+++ b/MPRSGxZ.backup/Exceptions/ZoneCountOutOfRangeException.cs
@@ -4,9 +4,6 @@ namespace MPRSGxZ.Exceptions
 {
 	class ZoneCountOutOfRangeException : Exception
 	{
-		public ZoneCountOutOfRangeException() : base()
-		{
-
-		}
+		public ZoneCountOutOfRangeException() : base() { }
 	}
 }
\ No newline at end of file
diff --git a/MPRSGxZ/Exceptions/ZoneNotEnabledException.cs b/MPRSGxZ.backup/Exceptions/ZoneNotEnabledException.cs
similarity index 73%
rename from MPRSGxZ/Exceptions/ZoneNotEnabledException.cs
rename to MPRSGxZ.backup/Exceptions/ZoneNotEnabledException.cs
index 3ad4e68..f369eb2 100644
--- a/MPRSGxZ/Exceptions/ZoneNotEnabledException.cs
+++ b/MPRSGxZ.backup/Exceptions/ZoneNotEnabledException.cs
@@ -4,12 +4,8 @@ namespace MPRSGxZ.Exceptions
 {
 	public class ZoneNotEnabledException : Exception
 	{
-		public ZoneNotEnabledException() : base()
-		{
-		}
+		public ZoneNotEnabledException() : base() {	}
 
-		public ZoneNotEnabledException(string message) : base(message)
-		{
-		}
+		public ZoneNotEnabledException(string message) : base(message) { }
 	}
 }
\ No newline at end of file
diff --git a/MPRSGxZ.backup/Exceptions/ZoneNotLinkedException.cs b/MPRSGxZ.backup/Exceptions/ZoneNotLinkedException.cs
new file mode 100644
index 0000000..df86afb
--- /dev/null
+++ b/MPRSGxZ.backup/Exceptions/ZoneNotLinkedException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	public class ZoneNotLinkedException : Exception
+	{
+		public ZoneNotLinkedException() : base() { }
+
+		public ZoneNotLinkedException(string message) : base(message) {	}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ/Hardware/Amplifier.cs b/MPRSGxZ.backup/Hardware/Amplifier.cs
similarity index 100%
rename from MPRSGxZ/Hardware/Amplifier.cs
rename to MPRSGxZ.backup/Hardware/Amplifier.cs
diff --git a/MPRSGxZ/Hardware/Source.cs b/MPRSGxZ.backup/Hardware/Source.cs
similarity index 100%
rename from MPRSGxZ/Hardware/Source.cs
rename to MPRSGxZ.backup/Hardware/Source.cs
diff --git a/MPRSGxZ/Hardware/Zone.cs b/MPRSGxZ.backup/Hardware/Zone.cs
similarity index 97%
rename from MPRSGxZ/Hardware/Zone.cs
rename to MPRSGxZ.backup/Hardware/Zone.cs
index 22fbbe1..76884b9 100644
--- a/MPRSGxZ/Hardware/Zone.cs
+++ b/MPRSGxZ.backup/Hardware/Zone.cs
@@ -273,7 +273,7 @@ public decimal VolumeFactor
 				if(m_VolumeFactor != value)
 				{
 					//
-					// Volume factor cant be negative (obviously) or zero (as this zone would never turn on).
+					// Volume factor can't be negative or zero (as this zone would never turn on).
 					// Technically we could have the volume factor go as high as Command.Volume.MaxValue,
 					// a set volume of 0 would result in an adjusted volume of 0 and a set volume of anything
 					// else would result in the adjusted volume being maxed.
@@ -296,14 +296,7 @@ public decimal VolumeFactor
 		/// <summary>
 		/// The calculated volume for this zone based off of the volume factor
 		/// </summary>
-#warning Make readonly in C# 8
-		public int AdjustedVolume
-		{
-			get
-			{
-				return Convert.ToInt32(m_VolumeFactor * _Volume);
-			}
-		}
+		public readonly int AdjustedVolume => Convert.ToInt32(m_VolumeFactor * _Volume);
 
 		internal void UpdateState(bool PublicAddress, bool Power, bool Mute, bool DoNotDisturb, int Volume, int Treble, int Bass, int Balance, int Source)
 		{
diff --git a/MPRSGxZ/MPRSGxZ.csproj b/MPRSGxZ.backup/MPRSGxZ.csproj
similarity index 100%
rename from MPRSGxZ/MPRSGxZ.csproj
rename to MPRSGxZ.backup/MPRSGxZ.csproj
diff --git a/MPRSGxZ/Ports/IPAmplifierPort.cs b/MPRSGxZ.backup/Ports/IPAmplifierPort.cs
similarity index 100%
rename from MPRSGxZ/Ports/IPAmplifierPort.cs
rename to MPRSGxZ.backup/Ports/IPAmplifierPort.cs
diff --git a/MPRSGxZ/Ports/IPort.cs b/MPRSGxZ.backup/Ports/IPort.cs
similarity index 100%
rename from MPRSGxZ/Ports/IPort.cs
rename to MPRSGxZ.backup/Ports/IPort.cs
diff --git a/MPRSGxZ/Ports/SerialAmplifierPort.cs b/MPRSGxZ.backup/Ports/SerialAmplifierPort.cs
similarity index 100%
rename from MPRSGxZ/Ports/SerialAmplifierPort.cs
rename to MPRSGxZ.backup/Ports/SerialAmplifierPort.cs
diff --git a/MPRSGxZ/Ports/VirtualAmplifierPort.cs b/MPRSGxZ.backup/Ports/VirtualAmplifierPort.cs
similarity index 100%
rename from MPRSGxZ/Ports/VirtualAmplifierPort.cs
rename to MPRSGxZ.backup/Ports/VirtualAmplifierPort.cs
diff --git a/MPRSGxZ/Properties/AssemblyInfo.cs b/MPRSGxZ.backup/Properties/AssemblyInfo.cs
similarity index 100%
rename from MPRSGxZ/Properties/AssemblyInfo.cs
rename to MPRSGxZ.backup/Properties/AssemblyInfo.cs
diff --git a/MPRSGxZ.backup/upgrade.backup b/MPRSGxZ.backup/upgrade.backup
new file mode 100644
index 0000000..bc50214
--- /dev/null
+++ b/MPRSGxZ.backup/upgrade.backup
@@ -0,0 +1 @@
+Backup created at 1638801948 (12/6/2021 2:45:48 PM +00:00)
\ No newline at end of file
diff --git a/MPRSGxZ.old/AmplifierStack.cs b/MPRSGxZ.old/AmplifierStack.cs
new file mode 100644
index 0000000..8c58c0e
--- /dev/null
+++ b/MPRSGxZ.old/AmplifierStack.cs
@@ -0,0 +1,232 @@
+using MPRSGxZ.Commands;
+using MPRSGxZ.Events;
+using MPRSGxZ.Hardware;
+using MPRSGxZ.Ports;
+using System.Net;
+using System.Timers;
+
+namespace MPRSGxZ
+{
+	public class AmplifierStack
+    {	
+		public int AmplifierCount { get; private set; }
+		public Amplifier[] Amplifiers { get; private set; }
+		public Source[] Sources { get; private set; }
+
+		private IPort Port;
+
+		private Timer PollTimer;
+
+		private QueueCommandEvent QueueCommand;
+		public	ZoneChangedEvent ZoneChanged;
+
+		public AmplifierStack(string PortName, int PollFrequency = 250, int AmplifierCount = 1)
+		{
+			this.Port = new SerialAmplifierPort(PortName);
+
+			ConstructorHelper(PollFrequency, AmplifierCount);
+		}
+
+		/// <summary>
+		/// Creates a simulated AmplifierStack
+		/// </summary>
+		/// <param name="PollFrequency"></param>
+		/// <param name="AmplifierCount"></param>
+		public AmplifierStack(int PollFrequency = 250, int AmplifierCount = 1)
+		{
+			this.Port = new VirtualAmplifierPort();
+
+			ConstructorHelper(PollFrequency, AmplifierCount);
+		}
+
+		public AmplifierStack(IPEndPoint ServerEndpoint, int PollFrequency = 250, int AmplifierCount = 1)
+		{
+			this.Port = new IPAmplifierPort(ServerEndpoint);
+
+			ConstructorHelper(PollFrequency, AmplifierCount);
+		}
+
+		private void ConstructorHelper(int PollFrequency, int AmplifierCount)
+		{
+			this.AmplifierCount = AmplifierCount;
+
+			this.PollTimer = new Timer(PollFrequency);
+			PollTimer.Elapsed += PollAmplifiers;
+
+			QueueCommand += QueueAmplifierCommand;
+
+			//
+			// All models have 6 sources, and when stacked the sources of the first amp are shared with
+			// all other amps.
+			//
+			Sources = new Source[6];
+
+			for (int i = 0; i < 6; i++)
+			{
+				Sources[i] = new Source(i + 1);
+			}
+
+			Amplifiers = new Amplifier[AmplifierCount];
+
+			for (int i = 0; i < AmplifierCount; i++)
+			{
+				Amplifiers[i] = new Amplifier(i + 1, QueueCommand, ZoneChanged);
+			}
+		}
+
+		public void Open()
+		{
+			Port.Open();
+			PollTimer.Enabled = true;
+		}
+
+		public void Close()
+		{
+			PollTimer.Enabled = false;
+			Port.Close();
+		}
+
+		private void PollAmplifiers(object sender, ElapsedEventArgs e)
+		{
+			for(int i = 1; i <= AmplifierCount; i++)
+			{
+				var CurrentAmplifier = Amplifiers[i - 1];
+
+				lock(CurrentAmplifier)
+				{
+					var CurrentAmpQuery = new Command(BaseCommand.Query, i, 0, 0);
+					var Responses = Port.ExecuteCommand(CurrentAmpQuery);
+
+					foreach (CommandResponse CurrentResponse in Responses)
+					{
+						var CurrentZone = CurrentAmplifier.Zones[CurrentResponse.ZoneID - 1];
+
+						CurrentZone.UpdateState(CurrentResponse.PublicAddress,
+												CurrentResponse.Power,
+												CurrentResponse.Mute,
+												CurrentResponse.DoNotDisturb,
+												CurrentResponse.Volume,
+												CurrentResponse.Treble,
+												CurrentResponse.Bass,
+												CurrentResponse.Balance,
+												CurrentResponse.Source);
+					}
+				}
+			}
+		}
+
+		private void QueueAmplifierCommand(QueueCommandEventArgs e)
+		{
+			int AmpID = e.Command.AmpID;
+			int ZoneID = e.Command.ZoneID;
+
+			var CurrentZone = Amplifiers[AmpID - 1].Zones[ZoneID - 1];
+
+			lock(CurrentZone)
+			{
+				var CommandResults = Port.ExecuteCommand(e.Command);
+			}
+		}
+
+		/*public void LinkZone(int PrimaryZoneID, int SecondaryZoneID)
+		{
+			Zone Primary = Zones[PrimaryZoneID - 1];
+			Zone Secondary = Zones[SecondaryZoneID - 1];
+
+			//
+			// Check to make sure both zones are enabled
+			//
+			string message = @"Zone {0} is not enabled and cannot be made into a link zone";
+
+			if (!Primary.Enabled)
+			{
+				throw new ZoneNotEnabledException(string.Format(message, PrimaryZoneID));
+			}
+
+			if(!Secondary.Enabled)
+			{
+				throw new ZoneNotEnabledException(string.Format(message, SecondaryZoneID));
+			}
+
+			//
+			// Check to make sure the primary zone is not already a secondary zone
+			//
+			message = @"Zone {0} is already a secondary zone and cannot be a primary";
+
+			if(Primary.LinkStatus == ZoneLinkMode.Secondary)
+			{
+				throw new ZoneAlreadyLinkedException(string.Format(message, PrimaryZoneID));
+			}
+
+			//
+			// Check to make sure the secondary zone is unlinked
+			//
+			message = @"Zone {0} is already a linked zone";
+
+			if (Secondary.LinkStatus != ZoneLinkMode.Unlinked)
+			{
+				throw new ZoneAlreadyLinkedException(string.Format(message, SecondaryZoneID));
+			}
+
+			//
+			// Go ahead and link the zones:
+			// Set the primary zone LinkStatus to Primary
+			// Set the secondary zone LinkStatus to Secondary
+			// Add the secondary zone ID to the primary LinkedZone list
+			//
+			Primary.LinkStatus = ZoneLinkMode.Primary;
+			Secondary.LinkStatus = ZoneLinkMode.Secondary;
+			Zones[PrimaryZoneID - 1].LinkedZones.Add(SecondaryZoneID);
+		}
+
+		public void UnlinkZone(int PrimaryZoneID, int SecondaryZoneID)
+		{
+			Zone Primary = Zones[PrimaryZoneID - 1];
+			Zone Secondary = Zones[SecondaryZoneID - 1];
+
+			//
+			// Check to make sure the primary zone is actually a primary zone
+			//
+			string message = @"Zone {0} is not a primary zone";
+
+			if (Primary.LinkStatus != ZoneLinkMode.Primary)
+			{
+				throw new ZoneNotLinkedException(string.Format(message, PrimaryZoneID));
+			}
+
+			//
+			// Check to make sure the secondary zone is actually a secondary zone
+			//
+			message = @"Zone {0} is not a secondary zone";
+
+			if (Secondary.LinkStatus != ZoneLinkMode.Secondary)
+			{
+				throw new ZoneNotLinkedException(string.Format(message, SecondaryZoneID));
+			}
+
+			//
+			// Check to make sure the secondary zone is a linked zone of the primary zone
+			//
+			message = @"Primary zone {0} is not linked to secondary zone {1}";
+
+			if(!Primary.LinkedZones.Contains(SecondaryZoneID))
+			{
+				throw new ZoneNotLinkedException(string.Format(message, PrimaryZoneID, SecondaryZoneID));
+			}
+
+			//
+			// Go ahead and link the zones:
+			// Remove the secondary zone from the LinkedZones list on the primary
+			// Set the secondary zone LinkStatus to Unlinked
+			// Check to see if the primary is now unlinked to all zones, if it is, set it to Unlinked
+			//
+			Primary.LinkedZones.Remove(SecondaryZoneID);
+			Secondary.LinkStatus = ZoneLinkMode.Unlinked;
+			
+			if(Primary.LinkedZones.Count == 0)
+			{
+				Primary.LinkStatus = ZoneLinkMode.Unlinked;
+			}
+		}*/
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Commands/BaseCommand.cs b/MPRSGxZ.old/Commands/BaseCommand.cs
new file mode 100644
index 0000000..4d9e182
--- /dev/null
+++ b/MPRSGxZ.old/Commands/BaseCommand.cs
@@ -0,0 +1,32 @@
+namespace MPRSGxZ.Commands
+{
+	internal class BaseCommand
+	{
+		public int MinValue		 { get; private set; }
+		public int MaxValue		 { get; private set; }
+		public int AmpID		 { get; internal set; }
+		public int ZoneID		 { get; internal set; }
+		public int Value		 { get; internal set; }
+		public int ExpectedLines { get; internal set; }
+
+		internal BaseCommand(int MinValue, int MaxValue)
+		{
+			this.MinValue = MinValue;
+			this.MaxValue = MaxValue;
+		}
+
+		// Queries
+		public static BaseCommand Query { get; }			= new QueryCommand(0, 6);
+
+		// Sets
+		public static BaseCommand Power { get; }			= new SetCommand(@"PR", 0, 1, 4);
+		public static BaseCommand Mute { get; }				= new SetCommand(@"MU", 0, 1, 6);
+		public static BaseCommand Volume { get; }			= new SetCommand(@"VO", 0, 38, 10);
+		public static BaseCommand Treble { get; }			= new SetCommand(@"TR", 0, 14, 12);
+		public static BaseCommand Bass { get; }				= new SetCommand(@"BS", 0, 14, 14);
+		public static BaseCommand Balance { get; }			= new SetCommand(@"BL", 0, 14, 16);
+		public static BaseCommand Source { get; }			= new SetCommand(@"CH", 1, 6, 18);
+		public static BaseCommand PublicAddress { get; }	= new SetCommand(@"PA", 0, 1, 2);
+		public static BaseCommand DoNotDisturb { get; }		= new SetCommand(@"DT", 0, 1, 8);
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Commands/Command.cs b/MPRSGxZ.old/Commands/Command.cs
new file mode 100644
index 0000000..14953a7
--- /dev/null
+++ b/MPRSGxZ.old/Commands/Command.cs
@@ -0,0 +1,79 @@
+using MPRSGxZ.Exceptions;
+using System;
+
+namespace MPRSGxZ.Commands
+{
+	internal class Command : BaseCommand
+	{
+		private BaseCommand _BaseCommand;
+		public CommandType Type { get; private set; }
+		public int ResponseIndex
+		{
+			get
+			{
+				if (_BaseCommand is SetCommand)
+				{
+					var Set = (SetCommand)this._BaseCommand;
+					return Set.ResponseIndex;
+				}
+
+				throw new InvalidOperationException(@"ResponseIndex is not valid on a QueryCommand");
+			}
+		}
+
+		internal Command(BaseCommand Command, int AmpID, int ZoneID, int Value) : base(Command.MinValue, Command.MaxValue)
+		{
+			if (AmpID < 1 || AmpID > 3)
+			{
+				throw new InvalidCommandException("The Amp ID for this command is not valid.");
+			}
+
+			if (ZoneID < 0 || ZoneID > 6)
+			{
+				throw new InvalidCommandException("The Zone ID for this command is not valid.");
+			}
+
+			if (Value < Command.MinValue || Value > Command.MaxValue)
+			{
+				throw new InvalidCommandException("The value for this command is not valid.");
+			}
+
+			_BaseCommand = Command;
+			this.AmpID = AmpID;
+			this.ZoneID = ZoneID;
+			this.Value = Value;
+
+			if (Command is QueryCommand)
+			{
+				Type = CommandType.Query;
+
+				if (Value == 0)
+				{
+					this.ExpectedLines = 6;
+				}
+				else
+				{
+					this.ExpectedLines = 1;
+				}
+			}
+			else
+			{
+				Type = CommandType.Set;
+			}
+		}
+
+		public static implicit operator string(Command Command)
+		{
+			if (Command._BaseCommand is QueryCommand)
+			{
+				var Query = (QueryCommand)Command._BaseCommand;
+				return (string)Query;
+			}
+			else
+			{
+				var Set = (SetCommand)Command._BaseCommand;
+				return (string)Set;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Commands/CommandResponse.cs b/MPRSGxZ.old/Commands/CommandResponse.cs
new file mode 100644
index 0000000..5a4968e
--- /dev/null
+++ b/MPRSGxZ.old/Commands/CommandResponse.cs
@@ -0,0 +1,37 @@
+namespace MPRSGxZ.Commands
+{
+	internal class CommandResponse
+	{
+		public int AmpID			{ get; private set; }
+		public int ZoneID			{ get; private set; }
+		public bool PublicAddress	{ get; private set; }
+		public bool Power			{ get; private set; }
+		public bool Mute			{ get; private set; }
+		public bool DoNotDisturb	{ get; private set; }
+		public int Volume			{ get; private set; }
+		public int Treble			{ get; private set; }
+		public int Bass				{ get; private set; }
+		public int Balance			{ get; private set; }
+		public int Source			{ get; private set; }
+
+		internal CommandResponse(string Response)
+		{
+			AmpID			= int.Parse(Response.Substring(0, 1));
+			ZoneID			= int.Parse(Response.Substring(1, 1));
+			PublicAddress	= int.Parse(Response.Substring(2, 2)) == 1 ? true : false;
+			Power			= int.Parse(Response.Substring(4, 2)) == 1 ? true : false;
+			Mute			= int.Parse(Response.Substring(6, 2)) == 1 ? true : false;
+			DoNotDisturb	= int.Parse(Response.Substring(8, 2)) == 1 ? true : false;
+			Volume			= int.Parse(Response.Substring(10, 2));
+			Treble			= int.Parse(Response.Substring(12, 2));
+			Bass			= int.Parse(Response.Substring(14, 2));
+			Balance			= int.Parse(Response.Substring(16, 2));
+			Source			= int.Parse(Response.Substring(18, 2));
+		}
+
+		public static implicit operator string(CommandResponse Response)
+		{
+			return $"{Response.AmpID:D1}{Response.ZoneID:D1}{(Response.PublicAddress ? 1 : 0):D2}{(Response.Power ? 1 : 0):D2}{(Response.Mute ? 1 : 0):D2}{(Response.DoNotDisturb ? 1 : 0):D2}{Response.Volume:D2}{Response.Treble:D2}{Response.Bass:D2}{Response.Balance:D2}{Response.Source:D2}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Commands/CommandType.cs b/MPRSGxZ.old/Commands/CommandType.cs
new file mode 100644
index 0000000..cb0dc67
--- /dev/null
+++ b/MPRSGxZ.old/Commands/CommandType.cs
@@ -0,0 +1,8 @@
+namespace MPRSGxZ.Commands
+{
+	internal enum CommandType
+	{
+		Query,
+		Set
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Commands/QueryCommand.cs b/MPRSGxZ.old/Commands/QueryCommand.cs
new file mode 100644
index 0000000..949eb3b
--- /dev/null
+++ b/MPRSGxZ.old/Commands/QueryCommand.cs
@@ -0,0 +1,14 @@
+namespace MPRSGxZ.Commands
+{
+	class QueryCommand : BaseCommand
+	{
+		internal QueryCommand(int MinValue, int MaxValue) : base(MinValue, MaxValue)
+		{
+		}
+
+		public static implicit operator string(QueryCommand Command)
+		{
+			return $"?{Command.AmpID}{Command.ZoneID}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Commands/SetCommand.cs b/MPRSGxZ.old/Commands/SetCommand.cs
new file mode 100644
index 0000000..0c37d1d
--- /dev/null
+++ b/MPRSGxZ.old/Commands/SetCommand.cs
@@ -0,0 +1,24 @@
+namespace MPRSGxZ.Commands
+{
+	class SetCommand : BaseCommand
+	{
+		public string CommandString { get; private set; }
+		public int ResponseIndex { get; private set; }
+
+		internal SetCommand(string CommandString, int MinValue, int MaxValue, int ResponseIndex) : base(MinValue, MaxValue)
+		{
+			//
+			// Set commands never have any response
+			//
+			this.ExpectedLines = 0;
+
+			this.CommandString = CommandString;
+			this.ResponseIndex = ResponseIndex;
+		}
+
+		public static implicit operator string(SetCommand Command)
+		{
+			return $"<{Command.AmpID}{Command.ZoneID}{Command.CommandString}{Command.Value:D2}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Enumerators/AmplifierType.cs b/MPRSGxZ.old/Enumerators/AmplifierType.cs
new file mode 100644
index 0000000..cafb9d3
--- /dev/null
+++ b/MPRSGxZ.old/Enumerators/AmplifierType.cs
@@ -0,0 +1,8 @@
+namespace MPRSGxZ.Enumerators
+{
+	public enum AmplifierType
+	{
+		FourZone = 0,
+		SixZone = 1
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Enumerators/ZoneLinkMode.cs b/MPRSGxZ.old/Enumerators/ZoneLinkMode.cs
new file mode 100644
index 0000000..c4eda35
--- /dev/null
+++ b/MPRSGxZ.old/Enumerators/ZoneLinkMode.cs
@@ -0,0 +1,9 @@
+namespace MPRSGxZ.Enumerators
+{
+	public enum ZoneLinkMode
+	{
+		Unlinked = 0,
+		Primary = 1,
+		Secondary = 2
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Events/QueueCommandEvent.cs b/MPRSGxZ.old/Events/QueueCommandEvent.cs
new file mode 100644
index 0000000..4829bbe
--- /dev/null
+++ b/MPRSGxZ.old/Events/QueueCommandEvent.cs
@@ -0,0 +1,4 @@
+namespace MPRSGxZ.Events
+{
+	internal delegate void QueueCommandEvent(QueueCommandEventArgs e);
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Events/QueueCommandEventArgs.cs b/MPRSGxZ.old/Events/QueueCommandEventArgs.cs
new file mode 100644
index 0000000..1e9d2f6
--- /dev/null
+++ b/MPRSGxZ.old/Events/QueueCommandEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+using MPRSGxZ.Commands;
+
+namespace MPRSGxZ.Events
+{
+	internal class QueueCommandEventArgs : EventArgs
+	{
+		public Command Command { get; private set; }
+
+		public QueueCommandEventArgs(Command Command)
+		{
+			this.Command = Command;
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Events/ZoneChangedEvent.cs b/MPRSGxZ.old/Events/ZoneChangedEvent.cs
new file mode 100644
index 0000000..e4a0140
--- /dev/null
+++ b/MPRSGxZ.old/Events/ZoneChangedEvent.cs
@@ -0,0 +1,4 @@
+namespace MPRSGxZ.Events
+{
+	public delegate void ZoneChangedEvent(ZoneChangedEventArgs e);
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Events/ZoneChangedEventArgs.cs b/MPRSGxZ.old/Events/ZoneChangedEventArgs.cs
new file mode 100644
index 0000000..6e27361
--- /dev/null
+++ b/MPRSGxZ.old/Events/ZoneChangedEventArgs.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace MPRSGxZ.Events
+{
+	public class ZoneChangedEventArgs : EventArgs
+	{
+		public int AmpID { get; internal set; }
+		public int ZoneID { get; internal set; }
+
+		public ZoneChangedEventArgs(int AmpID, int ZoneID)
+		{
+			this.AmpID = AmpID;
+			this.ZoneID = ZoneID;
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Exceptions/AmplifierCountOutOfRangeException.cs b/MPRSGxZ.old/Exceptions/AmplifierCountOutOfRangeException.cs
new file mode 100644
index 0000000..5585f62
--- /dev/null
+++ b/MPRSGxZ.old/Exceptions/AmplifierCountOutOfRangeException.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	class AmplifierCountOutOfRangeException : Exception
+	{
+		public AmplifierCountOutOfRangeException() : base() { }
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Exceptions/InvalidCommandException.cs b/MPRSGxZ.old/Exceptions/InvalidCommandException.cs
new file mode 100644
index 0000000..c5a4ce2
--- /dev/null
+++ b/MPRSGxZ.old/Exceptions/InvalidCommandException.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	class InvalidCommandException : Exception
+	{
+		public InvalidCommandException(string Message) : base(Message) { }
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Exceptions/ZoneAlreadyLinkedException.cs b/MPRSGxZ.old/Exceptions/ZoneAlreadyLinkedException.cs
new file mode 100644
index 0000000..27ed810
--- /dev/null
+++ b/MPRSGxZ.old/Exceptions/ZoneAlreadyLinkedException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	public class ZoneAlreadyLinkedException : Exception
+	{
+		public ZoneAlreadyLinkedException() : base() { }
+
+		public ZoneAlreadyLinkedException(string message) : base(message) {	}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Exceptions/ZoneCountOutOfRangeException.cs b/MPRSGxZ.old/Exceptions/ZoneCountOutOfRangeException.cs
new file mode 100644
index 0000000..79aadd5
--- /dev/null
+++ b/MPRSGxZ.old/Exceptions/ZoneCountOutOfRangeException.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	class ZoneCountOutOfRangeException : Exception
+	{
+		public ZoneCountOutOfRangeException() : base() { }
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Exceptions/ZoneNotEnabledException.cs b/MPRSGxZ.old/Exceptions/ZoneNotEnabledException.cs
new file mode 100644
index 0000000..f369eb2
--- /dev/null
+++ b/MPRSGxZ.old/Exceptions/ZoneNotEnabledException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	public class ZoneNotEnabledException : Exception
+	{
+		public ZoneNotEnabledException() : base() {	}
+
+		public ZoneNotEnabledException(string message) : base(message) { }
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Exceptions/ZoneNotLinkedException.cs b/MPRSGxZ.old/Exceptions/ZoneNotLinkedException.cs
new file mode 100644
index 0000000..df86afb
--- /dev/null
+++ b/MPRSGxZ.old/Exceptions/ZoneNotLinkedException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	public class ZoneNotLinkedException : Exception
+	{
+		public ZoneNotLinkedException() : base() { }
+
+		public ZoneNotLinkedException(string message) : base(message) {	}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Hardware/Amplifier.cs b/MPRSGxZ.old/Hardware/Amplifier.cs
new file mode 100644
index 0000000..5756176
--- /dev/null
+++ b/MPRSGxZ.old/Hardware/Amplifier.cs
@@ -0,0 +1,48 @@
+using MPRSGxZ.Events;
+
+namespace MPRSGxZ.Hardware
+{
+	public class Amplifier
+	{
+		public int ID { get; private set; }
+		public string Name { get; private set; }
+		public bool Enabled { get; private set; }
+
+		public Zone[] Zones { get; private set; }
+		private int ZoneCount;
+
+		//
+		// Settings can be amp-wide, not currently in use or implemented
+		//
+		/*
+		private bool m_Power;
+		private bool m_Mute;
+		private bool m_DoNotDisturb;
+		private int m_Volume;
+		private int m_Treble;
+		private int m_Bass;
+		private int m_Balance;
+		private int m_Source;
+		*/
+
+		/// <summary>
+		/// Default constructor for missing configuration
+		/// </summary>
+		/// <param name="AmpID">The ID of the amplifier</param>
+		internal Amplifier(int AmpID, QueueCommandEvent QueueCommand, ZoneChangedEvent ZoneChanged, int ZoneCount = 6)
+		{
+			this.ID = AmpID;
+			this.Enabled = true;
+			this.Name = $"Amp {ID}";
+
+			this.ZoneCount = ZoneCount;
+
+			Zones = new Zone[ZoneCount];
+
+			for(int i = 0; i < ZoneCount; i++)
+			{
+				Zones[i] = new Zone(ID, i + 1, QueueCommand, ZoneChanged);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Hardware/Source.cs b/MPRSGxZ.old/Hardware/Source.cs
new file mode 100644
index 0000000..71a35ed
--- /dev/null
+++ b/MPRSGxZ.old/Hardware/Source.cs
@@ -0,0 +1,16 @@
+namespace MPRSGxZ.Hardware
+{
+	public class Source
+	{
+		public int ID { get; internal set; }
+		public string Name;
+		public bool Enabled;
+
+		internal Source(int ID)
+		{
+			this.ID = ID;
+			Name = $"Source {ID}";
+			Enabled = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Hardware/Zone.cs b/MPRSGxZ.old/Hardware/Zone.cs
new file mode 100644
index 0000000..76884b9
--- /dev/null
+++ b/MPRSGxZ.old/Hardware/Zone.cs
@@ -0,0 +1,365 @@
+using MPRSGxZ.Commands;
+using MPRSGxZ.Enumerators;
+using MPRSGxZ.Events;
+using System;
+using System.Collections.Generic;
+
+namespace MPRSGxZ.Hardware
+{
+	public class Zone
+	{
+		//
+		// Amp IDs are the identifier that the firware uses for each amp (1, 2, or 3)
+		// Zone IDs are the identifier that the firmware uses for each zone (1-6)
+		//
+		// For example:
+		// Amp 1 Zone 1 = 11
+		// Amp 1 Zone 5 = 15
+		// Amp 2 Zone 1 = 21
+		// Amp 2 Zone 6 = 26
+		// and so on
+		//
+		public int AmpID { get; private set; }
+		public int ZoneID { get; private set; }
+
+		//
+		// Amplifier properties stored in the amp firmware
+		//
+		private bool _Power;
+		public bool Power
+		{
+			get
+			{
+				return _Power;
+			}
+			set
+			{
+				if (_Power != value)
+				{
+					_Power = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Power, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private bool _Mute;
+		public bool Mute
+		{
+			get
+			{
+				return _Mute;
+			}
+			set
+			{
+				if (_Mute != value)
+				{
+					_Mute = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Mute, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private bool _PublicAddress;
+		public bool PublicAddress
+		{
+			get
+			{
+				return _PublicAddress;
+			}
+			set
+			{
+				if (_PublicAddress != value)
+				{
+					_PublicAddress = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.PublicAddress, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private bool _DoNotDisturb;
+		public bool DoNotDisturb
+		{
+			get
+			{
+				return _DoNotDisturb;
+			}
+			set
+			{
+				if (_DoNotDisturb != value)
+				{
+					_DoNotDisturb = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.DoNotDisturb, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private int _Volume;
+		public int Volume
+		{
+			get
+			{
+				return _Volume;
+			}
+			set
+			{
+				if (_Volume != value)
+				{
+					if (value > Command.Volume.MaxValue)
+					{
+						value = Command.Volume.MaxValue;
+					}
+					else if (value < Command.Volume.MinValue)
+					{
+						value = Command.Volume.MinValue;
+					}
+
+					_Volume = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Volume, AmpID, ZoneID, value)));
+				}
+			}
+		}
+
+		private int _Treble;
+		public int Treble
+		{
+			get
+			{
+				return _Treble;
+			}
+			set
+			{
+				if (_Treble != value)
+				{
+					if (value > Command.Treble.MaxValue)
+					{
+						value = Command.Treble.MaxValue;
+					}
+					else if (value < Command.Treble.MinValue)
+					{
+						value = Command.Treble.MinValue;
+					}
+
+					_Treble = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Treble, AmpID, ZoneID, value)));
+				}
+			}
+		}
+
+		private int _Bass;
+		public int Bass
+		{
+			get
+			{
+				return _Bass;
+			}
+			set
+			{
+				if (_Bass != value)
+				{
+					if (value > Command.Bass.MaxValue)
+					{
+						value = Command.Bass.MaxValue;
+					}
+					else if (value < Command.Bass.MinValue)
+					{
+						value = Command.Bass.MinValue;
+					}
+
+					_Bass = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Treble, AmpID, ZoneID, value)));
+				}
+			}
+		}
+
+		private int _Balance;
+		public int Balance
+		{
+			get
+			{
+				return _Balance;
+			}
+			set
+			{
+				if (value > Command.Balance.MaxValue)
+				{
+					value = Command.Balance.MaxValue;
+				}
+				else if (value < Command.Balance.MinValue)
+				{
+					value = Command.Balance.MinValue;
+				}
+
+				_Balance = value;
+				QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Bass, AmpID, ZoneID, value)));
+			}
+		}
+
+		private int _Source;
+		public int Source
+		{
+			get
+			{
+				return _Source;
+			}
+			set
+			{
+				if (value > Command.Source.MaxValue)
+				{
+					value = Command.Source.MaxValue;
+				}
+				else if (value < Command.Source.MinValue)
+				{
+					value = Command.Source.MinValue;
+				}
+
+				_Source = value;
+				QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Source, AmpID, ZoneID, value)));
+			}
+		}
+
+		//
+		// Amplifier properties stored in software
+		//
+		public string Name { get; set; }
+		public bool Enabled { get; set; }
+		private ZoneLinkMode m_LinkStatus;
+		private List<int> m_LinkedZones;
+		private decimal m_VolumeFactor;
+
+		private event QueueCommandEvent QueueCommand;
+		private event ZoneChangedEvent ZoneChanged;
+
+		/// <summary>
+		/// Default constructor for missing configuration
+		/// </summary>
+		/// <param name="AmpID">The ID of the amplifier this zone is a member of</param>
+		/// <param name="AmpZoneID">The ID of this zone internal to the owning amplifier</param>
+		internal Zone(int AmpID, int ZoneID, QueueCommandEvent QueueCommand, ZoneChangedEvent ZoneChanged)
+		{
+			this.AmpID = AmpID;
+			this.ZoneID = ZoneID;
+			this.Enabled = true;
+			this.Name = $"Amp {AmpID} Zone {ZoneID}";
+			this.QueueCommand = QueueCommand;
+			this.ZoneChanged = ZoneChanged;
+
+			m_VolumeFactor = 1;
+			m_LinkStatus = ZoneLinkMode.Unlinked;
+			m_LinkedZones = new List<int>();
+		}
+
+		/// <summary>
+		/// Attaches events for the zone
+		/// </summary>
+		/// <param name="SettingChanged">The handler for when Zone software settings are changed</param>
+		/// <param name="QueueCommand">The handler to queue a command with the AmplifierPort when Zone hardware settings are changed</param>
+		internal void AttachEvents(QueueCommandEvent QueueCommand, ZoneChangedEvent ZoneChanged)
+		{
+			this.QueueCommand = QueueCommand;
+			this.ZoneChanged = ZoneChanged;
+		}
+
+		/// <summary>
+		/// A value which is multiplied with the volume set for this zone to produce the adjusted volume. Values less than 0 will be set to 0.1 and greater than 3 will be set to 3
+		/// </summary>
+		public decimal VolumeFactor
+		{
+			get
+			{
+				return m_VolumeFactor;
+			}
+			set
+			{
+				if(m_VolumeFactor != value)
+				{
+					//
+					// Volume factor can't be negative or zero (as this zone would never turn on).
+					// Technically we could have the volume factor go as high as Command.Volume.MaxValue,
+					// a set volume of 0 would result in an adjusted volume of 0 and a set volume of anything
+					// else would result in the adjusted volume being maxed.
+					//
+					// The maximum value of 5 an artificial limitation for the sake of sanity 
+					//
+					if (value <= 0 || value > 5)
+					{
+						throw new ArgumentOutOfRangeException();
+					}
+					else
+					{
+						m_VolumeFactor = value;
+						//SettingChangedEvent?.Invoke();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// The calculated volume for this zone based off of the volume factor
+		/// </summary>
+		public readonly int AdjustedVolume => Convert.ToInt32(m_VolumeFactor * _Volume);
+
+		internal void UpdateState(bool PublicAddress, bool Power, bool Mute, bool DoNotDisturb, int Volume, int Treble, int Bass, int Balance, int Source)
+		{
+			bool ValueChanged = false;
+
+			if(_PublicAddress != PublicAddress)
+			{
+				_PublicAddress = PublicAddress;
+				ValueChanged = true;
+			}
+			
+			if(_Power != Power)
+			{
+				_Power = Power;
+				ValueChanged = true;
+			}
+
+			if (_Mute != Mute)
+			{
+				_Mute = Mute;
+				ValueChanged = true;
+			}
+
+			if (_DoNotDisturb != DoNotDisturb)
+			{
+				_DoNotDisturb = DoNotDisturb;
+				ValueChanged = true;
+			}
+
+			if (_Volume != Volume)
+			{
+				_Volume = Volume;
+				ValueChanged = true;
+			}
+
+			if (_Treble != Treble)
+			{
+				_Treble = Treble;
+				ValueChanged = true;
+			}
+
+			if (_Bass != Bass)
+			{
+				_Bass = Bass;
+				ValueChanged = true;
+			}
+
+			if (_Balance != Balance)
+			{
+				_Balance = Balance;
+				ValueChanged = true;
+			}
+
+			if (_Source != Source)
+			{
+				_Source = Source;
+				ValueChanged = true;
+			}
+			
+			if(ValueChanged)
+			{
+				ZoneChanged?.Invoke(new ZoneChangedEventArgs(AmpID, ZoneID));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/MPRSGxZ.csproj b/MPRSGxZ.old/MPRSGxZ.csproj
new file mode 100644
index 0000000..b4ef2a4
--- /dev/null
+++ b/MPRSGxZ.old/MPRSGxZ.csproj
@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ProjectGuid>{9F947C76-0FF2-4BBF-BD94-5AFE9D0FA8A4}</ProjectGuid>
+    <TargetFramework>net452</TargetFramework>
+    <AssemblyTitle>MPRSGxZ</AssemblyTitle>
+    <Product>MPRSGxZ</Product>
+    <Copyright>Copyright ©  2016</Copyright>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.256001">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MPRSGxZ.old/Ports/IPAmplifierPort.cs b/MPRSGxZ.old/Ports/IPAmplifierPort.cs
new file mode 100644
index 0000000..fe87a6f
--- /dev/null
+++ b/MPRSGxZ.old/Ports/IPAmplifierPort.cs
@@ -0,0 +1,98 @@
+using MPRSGxZ.Commands;
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+
+namespace MPRSGxZ.Ports
+{
+	internal class IPAmplifierPort : IPort
+	{
+		private TcpClient Client;
+		private IPEndPoint ServerEndpoint;
+		private NetworkStream Stream;
+		private StreamWriter Writer;
+		private StreamReader Reader;
+		private object PortLock = new object();
+
+		internal IPAmplifierPort(IPEndPoint ServerEndpoint)
+		{
+			Client = new TcpClient();
+			this.ServerEndpoint = ServerEndpoint;
+		}
+
+		public void Open()
+		{
+			Client.Connect(ServerEndpoint);
+			Stream = Client.GetStream();
+
+			Writer = new StreamWriter(Stream, System.Text.Encoding.ASCII);
+			Writer.NewLine = "\r\n";
+			Writer.AutoFlush = true;
+
+			Reader = new StreamReader(Stream, System.Text.Encoding.ASCII);
+
+			Writer.WriteLine();
+			Reader.ReadLine();
+
+			if (Reader.Peek() != '#')
+			{
+				throw new InvalidOperationException("The serial port is in an unknown state.");
+			}
+		}
+
+		public void Close()
+		{
+			Reader.Close();
+			Writer.Close();
+			Stream.Close();
+			Client.Close();
+		}
+
+		public CommandResponse[] ExecuteCommand(Command CommandToExecute)
+		{
+			lock (PortLock)
+			{
+				Writer.WriteLine(CommandToExecute);
+				var Echo = Reader.ReadLine();
+
+				if ($"#{(string)CommandToExecute}" != Echo)
+				{
+					throw new InvalidOperationException("The serial port is in an unknown state.");
+				}
+
+				CommandResponse[] Response = new CommandResponse[CommandToExecute.ExpectedLines];
+				for (int i = 0; i < CommandToExecute.ExpectedLines; i++)
+				{
+					var CurrentLine = Reader.ReadLine();
+
+					//
+					// Read the additional CR
+					//
+					if (Reader.Peek() != 13)
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					var ExtraNewline = Reader.ReadLine();
+
+					if (ExtraNewline != string.Empty)
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					if (!CurrentLine.StartsWith(@"#>") && !CurrentLine.EndsWith("\r"))
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					CurrentLine = CurrentLine.Replace(@"#>", string.Empty);
+
+					Response[i] = new CommandResponse(CurrentLine);
+				}
+
+				return Response;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Ports/IPort.cs b/MPRSGxZ.old/Ports/IPort.cs
new file mode 100644
index 0000000..eb12a85
--- /dev/null
+++ b/MPRSGxZ.old/Ports/IPort.cs
@@ -0,0 +1,11 @@
+using MPRSGxZ.Commands;
+
+namespace MPRSGxZ.Ports
+{
+    internal interface IPort
+    {
+        void Open();
+        void Close();
+        CommandResponse[] ExecuteCommand(Command CommandToExecute);
+    }
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Ports/SerialAmplifierPort.cs b/MPRSGxZ.old/Ports/SerialAmplifierPort.cs
new file mode 100644
index 0000000..983b584
--- /dev/null
+++ b/MPRSGxZ.old/Ports/SerialAmplifierPort.cs
@@ -0,0 +1,78 @@
+using MPRSGxZ.Commands;
+using System;
+using System.IO.Ports;
+
+namespace MPRSGxZ.Ports
+{
+	internal class SerialAmplifierPort : IPort
+	{
+		private SerialPort Port;
+		private object PortLock = new object();
+
+		internal SerialAmplifierPort(string PortName)
+		{
+			Port = new SerialPort()
+			{
+				PortName = PortName,
+				BaudRate = 9600,
+				StopBits = StopBits.One,
+				Parity = Parity.None,
+				DataBits = 8,
+				Handshake = Handshake.None,
+				NewLine = "\r\n",
+				ReadTimeout = 100
+			};
+		}
+
+		public void Open()
+		{
+			Port.Open();
+
+			// Get the port into a known state
+			Port.WriteLine(string.Empty);
+			Port.ReadLine();
+
+			if (Port.BytesToRead != 1)
+			{
+				throw new InvalidOperationException("The serial port is in an unknown state.");
+			}
+		}
+
+		public void Close()
+		{
+			Port.Close();
+		}
+
+		public CommandResponse[] ExecuteCommand(Command CommandToExecute)
+		{
+			lock(PortLock)
+			{
+				Port.WriteLine(CommandToExecute);
+				var Echo = Port.ReadLine();
+
+				if($"#{(string)CommandToExecute}" != Echo)
+				{
+					throw new InvalidOperationException("The serial port is in an unknown state.");
+				}
+
+				CommandResponse[] Response = new CommandResponse[CommandToExecute.ExpectedLines];
+				for (int i = 0; i < CommandToExecute.ExpectedLines; i++)
+				{
+					var CurrentLine = Port.ReadLine();
+
+					if (!CurrentLine.StartsWith(@"#>") && !CurrentLine.EndsWith("\r"))
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					CurrentLine = CurrentLine.Replace("\r", string.Empty);
+					CurrentLine = CurrentLine.Replace(@"#>", string.Empty);
+
+					Response[i] = new CommandResponse(CurrentLine);
+				}
+
+				return Response;
+			}			
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Ports/VirtualAmplifierPort.cs b/MPRSGxZ.old/Ports/VirtualAmplifierPort.cs
new file mode 100644
index 0000000..4f5c82f
--- /dev/null
+++ b/MPRSGxZ.old/Ports/VirtualAmplifierPort.cs
@@ -0,0 +1,74 @@
+using MPRSGxZ.Commands;
+using System;
+
+namespace MPRSGxZ.Ports
+{
+	internal class VirtualAmplifierPort : IPort
+	{
+		private object PortLock = new object();
+		private string[] VirtualAmplifierState;
+
+		internal VirtualAmplifierPort()
+		{
+			VirtualAmplifierState = new string[18];
+
+			for (int AmplifierID = 1; AmplifierID <= 3; AmplifierID++)
+			{
+				for (int ZoneID = 1; ZoneID <= 6; ZoneID++)
+				{
+					int Index = ((AmplifierID - 1) * 6) + ZoneID - 1;
+
+					VirtualAmplifierState[Index] = $"{AmplifierID}{ZoneID}000000001907070701";
+				}
+			}
+		}
+
+		public void Open()
+		{
+		}
+
+		public void Close()
+		{
+		}
+
+		public CommandResponse[] ExecuteCommand(Command CommandToExecute)
+		{
+			lock (PortLock)
+			{
+				CommandResponse[] Response = new CommandResponse[CommandToExecute.ExpectedLines];
+				string[] SimulatedReads = new string[CommandToExecute.ExpectedLines];
+
+				int Index = ((CommandToExecute.AmpID - 1) * 6) + Math.Max(0, CommandToExecute.ZoneID - 1);
+
+				//
+				// Set commands don't return any data
+				//
+				if (CommandToExecute.Type == CommandType.Set)
+				{
+					var ZoneState = VirtualAmplifierState[Index];
+					var ParsedState = new CommandResponse(ZoneState);
+
+					var NewValue = $"{CommandToExecute.Value:D2}";
+					ZoneState = ZoneState.Remove(CommandToExecute.ResponseIndex, 2).Insert(CommandToExecute.ResponseIndex, NewValue);
+					VirtualAmplifierState[Index] = ZoneState;
+				}
+				//
+				// If the command is not a set command it is a query
+				// So return 1 response (if querying a single zone) or 6 responses (if querying a whole amplifier)
+				//
+				else
+				{
+					Array.Copy(VirtualAmplifierState, Index, SimulatedReads, 0, CommandToExecute.ExpectedLines);
+
+					for (int i = 0; i < CommandToExecute.ExpectedLines; i++)
+					{
+						var CurrentLine = SimulatedReads[i];
+						Response[i] = new CommandResponse(CurrentLine);
+					}
+				}
+
+				return Response;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/MPRSGxZ.old/Properties/AssemblyInfo.cs b/MPRSGxZ.old/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..af98068
--- /dev/null
+++ b/MPRSGxZ.old/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// 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("9f947c76-0ff2-4bbf-bd94-5afe9d0fa8a4")]
diff --git a/MPRSGxZ.sln b/MPRSGxZ.sln
index 1a09fbc..350fa0c 100644
--- a/MPRSGxZ.sln
+++ b/MPRSGxZ.sln
@@ -1,17 +1,15 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29215.179
+VisualStudioVersion = 16.0.31911.196
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MPRSGxZ", "MPRSGxZ\MPRSGxZ.csproj", "{9F947C76-0FF2-4BBF-BD94-5AFE9D0FA8A4}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmplifierTests", "AmplifierTests\AmplifierTests.csproj", "{E6980298-4861-45A7-9C20-116DDFDF0524}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmpMonitor", "AmpMonitor\AmpMonitor.csproj", "{4DBDB6BA-5F3B-4B00-968B-08E1FFA6ED43}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AmpAPI", "AmpAPI\AmpAPI.csproj", "{C4CED37A-2F98-4D4E-B6C6-CC450A4EFCB8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmpWeb", "AmpWeb\AmpWeb.csproj", "{13F96619-4B58-4C4D-9CA9-D75874A1F302}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MPRSGxZ", "NewLib\MPRSGxZ.csproj", "{D8AB6DC2-850D-4636-A1EE-30FAEDF6A2AF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,10 +17,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9F947C76-0FF2-4BBF-BD94-5AFE9D0FA8A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F947C76-0FF2-4BBF-BD94-5AFE9D0FA8A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F947C76-0FF2-4BBF-BD94-5AFE9D0FA8A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F947C76-0FF2-4BBF-BD94-5AFE9D0FA8A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E6980298-4861-45A7-9C20-116DDFDF0524}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E6980298-4861-45A7-9C20-116DDFDF0524}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E6980298-4861-45A7-9C20-116DDFDF0524}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -35,10 +29,10 @@ Global
 		{C4CED37A-2F98-4D4E-B6C6-CC450A4EFCB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C4CED37A-2F98-4D4E-B6C6-CC450A4EFCB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4CED37A-2F98-4D4E-B6C6-CC450A4EFCB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{13F96619-4B58-4C4D-9CA9-D75874A1F302}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{13F96619-4B58-4C4D-9CA9-D75874A1F302}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{13F96619-4B58-4C4D-9CA9-D75874A1F302}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{13F96619-4B58-4C4D-9CA9-D75874A1F302}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8AB6DC2-850D-4636-A1EE-30FAEDF6A2AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8AB6DC2-850D-4636-A1EE-30FAEDF6A2AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8AB6DC2-850D-4636-A1EE-30FAEDF6A2AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8AB6DC2-850D-4636-A1EE-30FAEDF6A2AF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/MPRSGxZ/Commands/CommandResponse.cs b/MPRSGxZ/Commands/CommandResponse.cs
deleted file mode 100644
index 1870e3a..0000000
--- a/MPRSGxZ/Commands/CommandResponse.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-namespace MPRSGxZ.Commands
-{
-	internal class CommandResponse
-	{
-		public int AmpID { get; private set; }
-		public int ZoneID { get; private set; }
-		public bool PublicAddress { get; private set; }
-		public bool Power { get; private set; }
-		public bool Mute { get; private set; }
-		public bool DoNotDisturb { get; private set; }
-		public int Volume { get; private set; }
-		public int Treble { get; private set; }
-		public int Bass { get; private set; }
-		public int Balance { get; private set; }
-		public int Source { get; private set; }
-
-		internal CommandResponse(string Response)
-		{
-			AmpID = int.Parse(Response.Substring(0, 1));
-			ZoneID = int.Parse(Response.Substring(1, 1));
-			PublicAddress = int.Parse(Response.Substring(2, 2)) == 1 ? true : false;
-			Power = int.Parse(Response.Substring(4, 2)) == 1 ? true : false;
-			Mute = int.Parse(Response.Substring(6, 2)) == 1 ? true : false;
-			DoNotDisturb = int.Parse(Response.Substring(8, 2)) == 1 ? true : false;
-			Volume = int.Parse(Response.Substring(10, 2));
-			Treble = int.Parse(Response.Substring(12, 2));
-			Bass = int.Parse(Response.Substring(14, 2));
-			Balance = int.Parse(Response.Substring(16, 2));
-			Source = int.Parse(Response.Substring(18, 2));
-		}
-
-		public static implicit operator string(CommandResponse Response)
-		{
-			return $"{Response.AmpID:D1}{Response.ZoneID:D1}{(Response.PublicAddress ? 1 : 0):D2}{(Response.Power ? 1 : 0):D2}{(Response.Mute ? 1 : 0):D2}{(Response.DoNotDisturb ? 1 : 0):D2}{Response.Volume:D2}{Response.Treble:D2}{Response.Bass:D2}{Response.Balance:D2}{Response.Source:D2}";
-		}
-	}
-}
\ No newline at end of file
diff --git a/MPRSGxZ/Exceptions/ZoneNotLinkedException.cs b/MPRSGxZ/Exceptions/ZoneNotLinkedException.cs
deleted file mode 100644
index a032662..0000000
--- a/MPRSGxZ/Exceptions/ZoneNotLinkedException.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace MPRSGxZ.Exceptions
-{
-	public class ZoneNotLinkedException : Exception
-	{
-		public ZoneNotLinkedException() : base()
-		{
-		}
-
-		public ZoneNotLinkedException(string message) : base(message)
-		{
-		}
-	}
-}
\ No newline at end of file
diff --git a/NewLib/AmplifierStack.cs b/NewLib/AmplifierStack.cs
new file mode 100644
index 0000000..8c58c0e
--- /dev/null
+++ b/NewLib/AmplifierStack.cs
@@ -0,0 +1,232 @@
+using MPRSGxZ.Commands;
+using MPRSGxZ.Events;
+using MPRSGxZ.Hardware;
+using MPRSGxZ.Ports;
+using System.Net;
+using System.Timers;
+
+namespace MPRSGxZ
+{
+	public class AmplifierStack
+    {	
+		public int AmplifierCount { get; private set; }
+		public Amplifier[] Amplifiers { get; private set; }
+		public Source[] Sources { get; private set; }
+
+		private IPort Port;
+
+		private Timer PollTimer;
+
+		private QueueCommandEvent QueueCommand;
+		public	ZoneChangedEvent ZoneChanged;
+
+		public AmplifierStack(string PortName, int PollFrequency = 250, int AmplifierCount = 1)
+		{
+			this.Port = new SerialAmplifierPort(PortName);
+
+			ConstructorHelper(PollFrequency, AmplifierCount);
+		}
+
+		/// <summary>
+		/// Creates a simulated AmplifierStack
+		/// </summary>
+		/// <param name="PollFrequency"></param>
+		/// <param name="AmplifierCount"></param>
+		public AmplifierStack(int PollFrequency = 250, int AmplifierCount = 1)
+		{
+			this.Port = new VirtualAmplifierPort();
+
+			ConstructorHelper(PollFrequency, AmplifierCount);
+		}
+
+		public AmplifierStack(IPEndPoint ServerEndpoint, int PollFrequency = 250, int AmplifierCount = 1)
+		{
+			this.Port = new IPAmplifierPort(ServerEndpoint);
+
+			ConstructorHelper(PollFrequency, AmplifierCount);
+		}
+
+		private void ConstructorHelper(int PollFrequency, int AmplifierCount)
+		{
+			this.AmplifierCount = AmplifierCount;
+
+			this.PollTimer = new Timer(PollFrequency);
+			PollTimer.Elapsed += PollAmplifiers;
+
+			QueueCommand += QueueAmplifierCommand;
+
+			//
+			// All models have 6 sources, and when stacked the sources of the first amp are shared with
+			// all other amps.
+			//
+			Sources = new Source[6];
+
+			for (int i = 0; i < 6; i++)
+			{
+				Sources[i] = new Source(i + 1);
+			}
+
+			Amplifiers = new Amplifier[AmplifierCount];
+
+			for (int i = 0; i < AmplifierCount; i++)
+			{
+				Amplifiers[i] = new Amplifier(i + 1, QueueCommand, ZoneChanged);
+			}
+		}
+
+		public void Open()
+		{
+			Port.Open();
+			PollTimer.Enabled = true;
+		}
+
+		public void Close()
+		{
+			PollTimer.Enabled = false;
+			Port.Close();
+		}
+
+		private void PollAmplifiers(object sender, ElapsedEventArgs e)
+		{
+			for(int i = 1; i <= AmplifierCount; i++)
+			{
+				var CurrentAmplifier = Amplifiers[i - 1];
+
+				lock(CurrentAmplifier)
+				{
+					var CurrentAmpQuery = new Command(BaseCommand.Query, i, 0, 0);
+					var Responses = Port.ExecuteCommand(CurrentAmpQuery);
+
+					foreach (CommandResponse CurrentResponse in Responses)
+					{
+						var CurrentZone = CurrentAmplifier.Zones[CurrentResponse.ZoneID - 1];
+
+						CurrentZone.UpdateState(CurrentResponse.PublicAddress,
+												CurrentResponse.Power,
+												CurrentResponse.Mute,
+												CurrentResponse.DoNotDisturb,
+												CurrentResponse.Volume,
+												CurrentResponse.Treble,
+												CurrentResponse.Bass,
+												CurrentResponse.Balance,
+												CurrentResponse.Source);
+					}
+				}
+			}
+		}
+
+		private void QueueAmplifierCommand(QueueCommandEventArgs e)
+		{
+			int AmpID = e.Command.AmpID;
+			int ZoneID = e.Command.ZoneID;
+
+			var CurrentZone = Amplifiers[AmpID - 1].Zones[ZoneID - 1];
+
+			lock(CurrentZone)
+			{
+				var CommandResults = Port.ExecuteCommand(e.Command);
+			}
+		}
+
+		/*public void LinkZone(int PrimaryZoneID, int SecondaryZoneID)
+		{
+			Zone Primary = Zones[PrimaryZoneID - 1];
+			Zone Secondary = Zones[SecondaryZoneID - 1];
+
+			//
+			// Check to make sure both zones are enabled
+			//
+			string message = @"Zone {0} is not enabled and cannot be made into a link zone";
+
+			if (!Primary.Enabled)
+			{
+				throw new ZoneNotEnabledException(string.Format(message, PrimaryZoneID));
+			}
+
+			if(!Secondary.Enabled)
+			{
+				throw new ZoneNotEnabledException(string.Format(message, SecondaryZoneID));
+			}
+
+			//
+			// Check to make sure the primary zone is not already a secondary zone
+			//
+			message = @"Zone {0} is already a secondary zone and cannot be a primary";
+
+			if(Primary.LinkStatus == ZoneLinkMode.Secondary)
+			{
+				throw new ZoneAlreadyLinkedException(string.Format(message, PrimaryZoneID));
+			}
+
+			//
+			// Check to make sure the secondary zone is unlinked
+			//
+			message = @"Zone {0} is already a linked zone";
+
+			if (Secondary.LinkStatus != ZoneLinkMode.Unlinked)
+			{
+				throw new ZoneAlreadyLinkedException(string.Format(message, SecondaryZoneID));
+			}
+
+			//
+			// Go ahead and link the zones:
+			// Set the primary zone LinkStatus to Primary
+			// Set the secondary zone LinkStatus to Secondary
+			// Add the secondary zone ID to the primary LinkedZone list
+			//
+			Primary.LinkStatus = ZoneLinkMode.Primary;
+			Secondary.LinkStatus = ZoneLinkMode.Secondary;
+			Zones[PrimaryZoneID - 1].LinkedZones.Add(SecondaryZoneID);
+		}
+
+		public void UnlinkZone(int PrimaryZoneID, int SecondaryZoneID)
+		{
+			Zone Primary = Zones[PrimaryZoneID - 1];
+			Zone Secondary = Zones[SecondaryZoneID - 1];
+
+			//
+			// Check to make sure the primary zone is actually a primary zone
+			//
+			string message = @"Zone {0} is not a primary zone";
+
+			if (Primary.LinkStatus != ZoneLinkMode.Primary)
+			{
+				throw new ZoneNotLinkedException(string.Format(message, PrimaryZoneID));
+			}
+
+			//
+			// Check to make sure the secondary zone is actually a secondary zone
+			//
+			message = @"Zone {0} is not a secondary zone";
+
+			if (Secondary.LinkStatus != ZoneLinkMode.Secondary)
+			{
+				throw new ZoneNotLinkedException(string.Format(message, SecondaryZoneID));
+			}
+
+			//
+			// Check to make sure the secondary zone is a linked zone of the primary zone
+			//
+			message = @"Primary zone {0} is not linked to secondary zone {1}";
+
+			if(!Primary.LinkedZones.Contains(SecondaryZoneID))
+			{
+				throw new ZoneNotLinkedException(string.Format(message, PrimaryZoneID, SecondaryZoneID));
+			}
+
+			//
+			// Go ahead and link the zones:
+			// Remove the secondary zone from the LinkedZones list on the primary
+			// Set the secondary zone LinkStatus to Unlinked
+			// Check to see if the primary is now unlinked to all zones, if it is, set it to Unlinked
+			//
+			Primary.LinkedZones.Remove(SecondaryZoneID);
+			Secondary.LinkStatus = ZoneLinkMode.Unlinked;
+			
+			if(Primary.LinkedZones.Count == 0)
+			{
+				Primary.LinkStatus = ZoneLinkMode.Unlinked;
+			}
+		}*/
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Commands/BaseCommand.cs b/NewLib/Commands/BaseCommand.cs
new file mode 100644
index 0000000..4d9e182
--- /dev/null
+++ b/NewLib/Commands/BaseCommand.cs
@@ -0,0 +1,32 @@
+namespace MPRSGxZ.Commands
+{
+	internal class BaseCommand
+	{
+		public int MinValue		 { get; private set; }
+		public int MaxValue		 { get; private set; }
+		public int AmpID		 { get; internal set; }
+		public int ZoneID		 { get; internal set; }
+		public int Value		 { get; internal set; }
+		public int ExpectedLines { get; internal set; }
+
+		internal BaseCommand(int MinValue, int MaxValue)
+		{
+			this.MinValue = MinValue;
+			this.MaxValue = MaxValue;
+		}
+
+		// Queries
+		public static BaseCommand Query { get; }			= new QueryCommand(0, 6);
+
+		// Sets
+		public static BaseCommand Power { get; }			= new SetCommand(@"PR", 0, 1, 4);
+		public static BaseCommand Mute { get; }				= new SetCommand(@"MU", 0, 1, 6);
+		public static BaseCommand Volume { get; }			= new SetCommand(@"VO", 0, 38, 10);
+		public static BaseCommand Treble { get; }			= new SetCommand(@"TR", 0, 14, 12);
+		public static BaseCommand Bass { get; }				= new SetCommand(@"BS", 0, 14, 14);
+		public static BaseCommand Balance { get; }			= new SetCommand(@"BL", 0, 14, 16);
+		public static BaseCommand Source { get; }			= new SetCommand(@"CH", 1, 6, 18);
+		public static BaseCommand PublicAddress { get; }	= new SetCommand(@"PA", 0, 1, 2);
+		public static BaseCommand DoNotDisturb { get; }		= new SetCommand(@"DT", 0, 1, 8);
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Commands/Command.cs b/NewLib/Commands/Command.cs
new file mode 100644
index 0000000..14953a7
--- /dev/null
+++ b/NewLib/Commands/Command.cs
@@ -0,0 +1,79 @@
+using MPRSGxZ.Exceptions;
+using System;
+
+namespace MPRSGxZ.Commands
+{
+	internal class Command : BaseCommand
+	{
+		private BaseCommand _BaseCommand;
+		public CommandType Type { get; private set; }
+		public int ResponseIndex
+		{
+			get
+			{
+				if (_BaseCommand is SetCommand)
+				{
+					var Set = (SetCommand)this._BaseCommand;
+					return Set.ResponseIndex;
+				}
+
+				throw new InvalidOperationException(@"ResponseIndex is not valid on a QueryCommand");
+			}
+		}
+
+		internal Command(BaseCommand Command, int AmpID, int ZoneID, int Value) : base(Command.MinValue, Command.MaxValue)
+		{
+			if (AmpID < 1 || AmpID > 3)
+			{
+				throw new InvalidCommandException("The Amp ID for this command is not valid.");
+			}
+
+			if (ZoneID < 0 || ZoneID > 6)
+			{
+				throw new InvalidCommandException("The Zone ID for this command is not valid.");
+			}
+
+			if (Value < Command.MinValue || Value > Command.MaxValue)
+			{
+				throw new InvalidCommandException("The value for this command is not valid.");
+			}
+
+			_BaseCommand = Command;
+			this.AmpID = AmpID;
+			this.ZoneID = ZoneID;
+			this.Value = Value;
+
+			if (Command is QueryCommand)
+			{
+				Type = CommandType.Query;
+
+				if (Value == 0)
+				{
+					this.ExpectedLines = 6;
+				}
+				else
+				{
+					this.ExpectedLines = 1;
+				}
+			}
+			else
+			{
+				Type = CommandType.Set;
+			}
+		}
+
+		public static implicit operator string(Command Command)
+		{
+			if (Command._BaseCommand is QueryCommand)
+			{
+				var Query = (QueryCommand)Command._BaseCommand;
+				return (string)Query;
+			}
+			else
+			{
+				var Set = (SetCommand)Command._BaseCommand;
+				return (string)Set;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Commands/CommandResponse.cs b/NewLib/Commands/CommandResponse.cs
new file mode 100644
index 0000000..5a4968e
--- /dev/null
+++ b/NewLib/Commands/CommandResponse.cs
@@ -0,0 +1,37 @@
+namespace MPRSGxZ.Commands
+{
+	internal class CommandResponse
+	{
+		public int AmpID			{ get; private set; }
+		public int ZoneID			{ get; private set; }
+		public bool PublicAddress	{ get; private set; }
+		public bool Power			{ get; private set; }
+		public bool Mute			{ get; private set; }
+		public bool DoNotDisturb	{ get; private set; }
+		public int Volume			{ get; private set; }
+		public int Treble			{ get; private set; }
+		public int Bass				{ get; private set; }
+		public int Balance			{ get; private set; }
+		public int Source			{ get; private set; }
+
+		internal CommandResponse(string Response)
+		{
+			AmpID			= int.Parse(Response.Substring(0, 1));
+			ZoneID			= int.Parse(Response.Substring(1, 1));
+			PublicAddress	= int.Parse(Response.Substring(2, 2)) == 1 ? true : false;
+			Power			= int.Parse(Response.Substring(4, 2)) == 1 ? true : false;
+			Mute			= int.Parse(Response.Substring(6, 2)) == 1 ? true : false;
+			DoNotDisturb	= int.Parse(Response.Substring(8, 2)) == 1 ? true : false;
+			Volume			= int.Parse(Response.Substring(10, 2));
+			Treble			= int.Parse(Response.Substring(12, 2));
+			Bass			= int.Parse(Response.Substring(14, 2));
+			Balance			= int.Parse(Response.Substring(16, 2));
+			Source			= int.Parse(Response.Substring(18, 2));
+		}
+
+		public static implicit operator string(CommandResponse Response)
+		{
+			return $"{Response.AmpID:D1}{Response.ZoneID:D1}{(Response.PublicAddress ? 1 : 0):D2}{(Response.Power ? 1 : 0):D2}{(Response.Mute ? 1 : 0):D2}{(Response.DoNotDisturb ? 1 : 0):D2}{Response.Volume:D2}{Response.Treble:D2}{Response.Bass:D2}{Response.Balance:D2}{Response.Source:D2}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Commands/CommandType.cs b/NewLib/Commands/CommandType.cs
new file mode 100644
index 0000000..cb0dc67
--- /dev/null
+++ b/NewLib/Commands/CommandType.cs
@@ -0,0 +1,8 @@
+namespace MPRSGxZ.Commands
+{
+	internal enum CommandType
+	{
+		Query,
+		Set
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Commands/QueryCommand.cs b/NewLib/Commands/QueryCommand.cs
new file mode 100644
index 0000000..949eb3b
--- /dev/null
+++ b/NewLib/Commands/QueryCommand.cs
@@ -0,0 +1,14 @@
+namespace MPRSGxZ.Commands
+{
+	class QueryCommand : BaseCommand
+	{
+		internal QueryCommand(int MinValue, int MaxValue) : base(MinValue, MaxValue)
+		{
+		}
+
+		public static implicit operator string(QueryCommand Command)
+		{
+			return $"?{Command.AmpID}{Command.ZoneID}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Commands/SetCommand.cs b/NewLib/Commands/SetCommand.cs
new file mode 100644
index 0000000..0c37d1d
--- /dev/null
+++ b/NewLib/Commands/SetCommand.cs
@@ -0,0 +1,24 @@
+namespace MPRSGxZ.Commands
+{
+	class SetCommand : BaseCommand
+	{
+		public string CommandString { get; private set; }
+		public int ResponseIndex { get; private set; }
+
+		internal SetCommand(string CommandString, int MinValue, int MaxValue, int ResponseIndex) : base(MinValue, MaxValue)
+		{
+			//
+			// Set commands never have any response
+			//
+			this.ExpectedLines = 0;
+
+			this.CommandString = CommandString;
+			this.ResponseIndex = ResponseIndex;
+		}
+
+		public static implicit operator string(SetCommand Command)
+		{
+			return $"<{Command.AmpID}{Command.ZoneID}{Command.CommandString}{Command.Value:D2}";
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Enumerators/AmplifierType.cs b/NewLib/Enumerators/AmplifierType.cs
new file mode 100644
index 0000000..cafb9d3
--- /dev/null
+++ b/NewLib/Enumerators/AmplifierType.cs
@@ -0,0 +1,8 @@
+namespace MPRSGxZ.Enumerators
+{
+	public enum AmplifierType
+	{
+		FourZone = 0,
+		SixZone = 1
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Enumerators/ZoneLinkMode.cs b/NewLib/Enumerators/ZoneLinkMode.cs
new file mode 100644
index 0000000..c4eda35
--- /dev/null
+++ b/NewLib/Enumerators/ZoneLinkMode.cs
@@ -0,0 +1,9 @@
+namespace MPRSGxZ.Enumerators
+{
+	public enum ZoneLinkMode
+	{
+		Unlinked = 0,
+		Primary = 1,
+		Secondary = 2
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Events/QueueCommandEvent.cs b/NewLib/Events/QueueCommandEvent.cs
new file mode 100644
index 0000000..4829bbe
--- /dev/null
+++ b/NewLib/Events/QueueCommandEvent.cs
@@ -0,0 +1,4 @@
+namespace MPRSGxZ.Events
+{
+	internal delegate void QueueCommandEvent(QueueCommandEventArgs e);
+}
\ No newline at end of file
diff --git a/NewLib/Events/QueueCommandEventArgs.cs b/NewLib/Events/QueueCommandEventArgs.cs
new file mode 100644
index 0000000..1e9d2f6
--- /dev/null
+++ b/NewLib/Events/QueueCommandEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+using MPRSGxZ.Commands;
+
+namespace MPRSGxZ.Events
+{
+	internal class QueueCommandEventArgs : EventArgs
+	{
+		public Command Command { get; private set; }
+
+		public QueueCommandEventArgs(Command Command)
+		{
+			this.Command = Command;
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Events/ZoneChangedEvent.cs b/NewLib/Events/ZoneChangedEvent.cs
new file mode 100644
index 0000000..e4a0140
--- /dev/null
+++ b/NewLib/Events/ZoneChangedEvent.cs
@@ -0,0 +1,4 @@
+namespace MPRSGxZ.Events
+{
+	public delegate void ZoneChangedEvent(ZoneChangedEventArgs e);
+}
\ No newline at end of file
diff --git a/NewLib/Events/ZoneChangedEventArgs.cs b/NewLib/Events/ZoneChangedEventArgs.cs
new file mode 100644
index 0000000..6e27361
--- /dev/null
+++ b/NewLib/Events/ZoneChangedEventArgs.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace MPRSGxZ.Events
+{
+	public class ZoneChangedEventArgs : EventArgs
+	{
+		public int AmpID { get; internal set; }
+		public int ZoneID { get; internal set; }
+
+		public ZoneChangedEventArgs(int AmpID, int ZoneID)
+		{
+			this.AmpID = AmpID;
+			this.ZoneID = ZoneID;
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Exceptions/AmplifierCountOutOfRangeException.cs b/NewLib/Exceptions/AmplifierCountOutOfRangeException.cs
new file mode 100644
index 0000000..5585f62
--- /dev/null
+++ b/NewLib/Exceptions/AmplifierCountOutOfRangeException.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	class AmplifierCountOutOfRangeException : Exception
+	{
+		public AmplifierCountOutOfRangeException() : base() { }
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Exceptions/InvalidCommandException.cs b/NewLib/Exceptions/InvalidCommandException.cs
new file mode 100644
index 0000000..c5a4ce2
--- /dev/null
+++ b/NewLib/Exceptions/InvalidCommandException.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	class InvalidCommandException : Exception
+	{
+		public InvalidCommandException(string Message) : base(Message) { }
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Exceptions/ZoneAlreadyLinkedException.cs b/NewLib/Exceptions/ZoneAlreadyLinkedException.cs
new file mode 100644
index 0000000..27ed810
--- /dev/null
+++ b/NewLib/Exceptions/ZoneAlreadyLinkedException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	public class ZoneAlreadyLinkedException : Exception
+	{
+		public ZoneAlreadyLinkedException() : base() { }
+
+		public ZoneAlreadyLinkedException(string message) : base(message) {	}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Exceptions/ZoneCountOutOfRangeException.cs b/NewLib/Exceptions/ZoneCountOutOfRangeException.cs
new file mode 100644
index 0000000..79aadd5
--- /dev/null
+++ b/NewLib/Exceptions/ZoneCountOutOfRangeException.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	class ZoneCountOutOfRangeException : Exception
+	{
+		public ZoneCountOutOfRangeException() : base() { }
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Exceptions/ZoneNotEnabledException.cs b/NewLib/Exceptions/ZoneNotEnabledException.cs
new file mode 100644
index 0000000..f369eb2
--- /dev/null
+++ b/NewLib/Exceptions/ZoneNotEnabledException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	public class ZoneNotEnabledException : Exception
+	{
+		public ZoneNotEnabledException() : base() {	}
+
+		public ZoneNotEnabledException(string message) : base(message) { }
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Exceptions/ZoneNotLinkedException.cs b/NewLib/Exceptions/ZoneNotLinkedException.cs
new file mode 100644
index 0000000..df86afb
--- /dev/null
+++ b/NewLib/Exceptions/ZoneNotLinkedException.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace MPRSGxZ.Exceptions
+{
+	public class ZoneNotLinkedException : Exception
+	{
+		public ZoneNotLinkedException() : base() { }
+
+		public ZoneNotLinkedException(string message) : base(message) {	}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Hardware/Amplifier.cs b/NewLib/Hardware/Amplifier.cs
new file mode 100644
index 0000000..5756176
--- /dev/null
+++ b/NewLib/Hardware/Amplifier.cs
@@ -0,0 +1,48 @@
+using MPRSGxZ.Events;
+
+namespace MPRSGxZ.Hardware
+{
+	public class Amplifier
+	{
+		public int ID { get; private set; }
+		public string Name { get; private set; }
+		public bool Enabled { get; private set; }
+
+		public Zone[] Zones { get; private set; }
+		private int ZoneCount;
+
+		//
+		// Settings can be amp-wide, not currently in use or implemented
+		//
+		/*
+		private bool m_Power;
+		private bool m_Mute;
+		private bool m_DoNotDisturb;
+		private int m_Volume;
+		private int m_Treble;
+		private int m_Bass;
+		private int m_Balance;
+		private int m_Source;
+		*/
+
+		/// <summary>
+		/// Default constructor for missing configuration
+		/// </summary>
+		/// <param name="AmpID">The ID of the amplifier</param>
+		internal Amplifier(int AmpID, QueueCommandEvent QueueCommand, ZoneChangedEvent ZoneChanged, int ZoneCount = 6)
+		{
+			this.ID = AmpID;
+			this.Enabled = true;
+			this.Name = $"Amp {ID}";
+
+			this.ZoneCount = ZoneCount;
+
+			Zones = new Zone[ZoneCount];
+
+			for(int i = 0; i < ZoneCount; i++)
+			{
+				Zones[i] = new Zone(ID, i + 1, QueueCommand, ZoneChanged);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Hardware/Source.cs b/NewLib/Hardware/Source.cs
new file mode 100644
index 0000000..71a35ed
--- /dev/null
+++ b/NewLib/Hardware/Source.cs
@@ -0,0 +1,16 @@
+namespace MPRSGxZ.Hardware
+{
+	public class Source
+	{
+		public int ID { get; internal set; }
+		public string Name;
+		public bool Enabled;
+
+		internal Source(int ID)
+		{
+			this.ID = ID;
+			Name = $"Source {ID}";
+			Enabled = true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Hardware/Zone.cs b/NewLib/Hardware/Zone.cs
new file mode 100644
index 0000000..6ec4319
--- /dev/null
+++ b/NewLib/Hardware/Zone.cs
@@ -0,0 +1,365 @@
+using MPRSGxZ.Commands;
+using MPRSGxZ.Enumerators;
+using MPRSGxZ.Events;
+using System;
+using System.Collections.Generic;
+
+namespace MPRSGxZ.Hardware
+{
+	public class Zone
+	{
+		//
+		// Amp IDs are the identifier that the firware uses for each amp (1, 2, or 3)
+		// Zone IDs are the identifier that the firmware uses for each zone (1-6)
+		//
+		// For example:
+		// Amp 1 Zone 1 = 11
+		// Amp 1 Zone 5 = 15
+		// Amp 2 Zone 1 = 21
+		// Amp 2 Zone 6 = 26
+		// and so on
+		//
+		public int AmpID { get; private set; }
+		public int ZoneID { get; private set; }
+
+		//
+		// Amplifier properties stored in the amp firmware
+		//
+		private bool _Power;
+		public bool Power
+		{
+			get
+			{
+				return _Power;
+			}
+			set
+			{
+				if (_Power != value)
+				{
+					_Power = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Power, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private bool _Mute;
+		public bool Mute
+		{
+			get
+			{
+				return _Mute;
+			}
+			set
+			{
+				if (_Mute != value)
+				{
+					_Mute = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Mute, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private bool _PublicAddress;
+		public bool PublicAddress
+		{
+			get
+			{
+				return _PublicAddress;
+			}
+			set
+			{
+				if (_PublicAddress != value)
+				{
+					_PublicAddress = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.PublicAddress, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private bool _DoNotDisturb;
+		public bool DoNotDisturb
+		{
+			get
+			{
+				return _DoNotDisturb;
+			}
+			set
+			{
+				if (_DoNotDisturb != value)
+				{
+					_DoNotDisturb = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.DoNotDisturb, AmpID, ZoneID, value ? 1 : 0)));
+				}
+			}
+		}
+
+		private int _Volume;
+		public int Volume
+		{
+			get
+			{
+				return _Volume;
+			}
+			set
+			{
+				if (_Volume != value)
+				{
+					if (value > Command.Volume.MaxValue)
+					{
+						value = Command.Volume.MaxValue;
+					}
+					else if (value < Command.Volume.MinValue)
+					{
+						value = Command.Volume.MinValue;
+					}
+
+					_Volume = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Volume, AmpID, ZoneID, value)));
+				}
+			}
+		}
+
+		private int _Treble;
+		public int Treble
+		{
+			get
+			{
+				return _Treble;
+			}
+			set
+			{
+				if (_Treble != value)
+				{
+					if (value > Command.Treble.MaxValue)
+					{
+						value = Command.Treble.MaxValue;
+					}
+					else if (value < Command.Treble.MinValue)
+					{
+						value = Command.Treble.MinValue;
+					}
+
+					_Treble = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Treble, AmpID, ZoneID, value)));
+				}
+			}
+		}
+
+		private int _Bass;
+		public int Bass
+		{
+			get
+			{
+				return _Bass;
+			}
+			set
+			{
+				if (_Bass != value)
+				{
+					if (value > Command.Bass.MaxValue)
+					{
+						value = Command.Bass.MaxValue;
+					}
+					else if (value < Command.Bass.MinValue)
+					{
+						value = Command.Bass.MinValue;
+					}
+
+					_Bass = value;
+					QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Treble, AmpID, ZoneID, value)));
+				}
+			}
+		}
+
+		private int _Balance;
+		public int Balance
+		{
+			get
+			{
+				return _Balance;
+			}
+			set
+			{
+				if (value > Command.Balance.MaxValue)
+				{
+					value = Command.Balance.MaxValue;
+				}
+				else if (value < Command.Balance.MinValue)
+				{
+					value = Command.Balance.MinValue;
+				}
+
+				_Balance = value;
+				QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Bass, AmpID, ZoneID, value)));
+			}
+		}
+
+		private int _Source;
+		public int Source
+		{
+			get
+			{
+				return _Source;
+			}
+			set
+			{
+				if (value > Command.Source.MaxValue)
+				{
+					value = Command.Source.MaxValue;
+				}
+				else if (value < Command.Source.MinValue)
+				{
+					value = Command.Source.MinValue;
+				}
+
+				_Source = value;
+				QueueCommand?.Invoke(new QueueCommandEventArgs(new Command(BaseCommand.Source, AmpID, ZoneID, value)));
+			}
+		}
+
+		//
+		// Amplifier properties stored in software
+		//
+		public string Name { get; set; }
+		public bool Enabled { get; set; }
+		private ZoneLinkMode m_LinkStatus;
+		private List<int> m_LinkedZones;
+		private decimal m_VolumeFactor;
+
+		private event QueueCommandEvent QueueCommand;
+		private event ZoneChangedEvent ZoneChanged;
+
+		/// <summary>
+		/// Default constructor for missing configuration
+		/// </summary>
+		/// <param name="AmpID">The ID of the amplifier this zone is a member of</param>
+		/// <param name="AmpZoneID">The ID of this zone internal to the owning amplifier</param>
+		internal Zone(int AmpID, int ZoneID, QueueCommandEvent QueueCommand, ZoneChangedEvent ZoneChanged)
+		{
+			this.AmpID = AmpID;
+			this.ZoneID = ZoneID;
+			this.Enabled = true;
+			this.Name = $"Amp {AmpID} Zone {ZoneID}";
+			this.QueueCommand = QueueCommand;
+			this.ZoneChanged = ZoneChanged;
+
+			m_VolumeFactor = 1;
+			m_LinkStatus = ZoneLinkMode.Unlinked;
+			m_LinkedZones = new List<int>();
+		}
+
+		/// <summary>
+		/// Attaches events for the zone
+		/// </summary>
+		/// <param name="SettingChanged">The handler for when Zone software settings are changed</param>
+		/// <param name="QueueCommand">The handler to queue a command with the AmplifierPort when Zone hardware settings are changed</param>
+		internal void AttachEvents(QueueCommandEvent QueueCommand, ZoneChangedEvent ZoneChanged)
+		{
+			this.QueueCommand = QueueCommand;
+			this.ZoneChanged = ZoneChanged;
+		}
+
+		/// <summary>
+		/// A value which is multiplied with the volume set for this zone to produce the adjusted volume. Values less than 0 will be set to 0.1 and greater than 3 will be set to 3
+		/// </summary>
+		public decimal VolumeFactor
+		{
+			get
+			{
+				return m_VolumeFactor;
+			}
+			set
+			{
+				if(m_VolumeFactor != value)
+				{
+					//
+					// Volume factor can't be negative or zero (as this zone would never turn on).
+					// Technically we could have the volume factor go as high as Command.Volume.MaxValue,
+					// a set volume of 0 would result in an adjusted volume of 0 and a set volume of anything
+					// else would result in the adjusted volume being maxed.
+					//
+					// The maximum value of 5 an artificial limitation for the sake of sanity 
+					//
+					if (value <= 0 || value > 5)
+					{
+						throw new ArgumentOutOfRangeException();
+					}
+					else
+					{
+						m_VolumeFactor = value;
+						//SettingChangedEvent?.Invoke();
+					}
+				}
+			}
+		}
+
+		/// <summary>
+		/// The calculated volume for this zone based off of the volume factor
+		/// </summary>
+		//public readonly int AdjustedVolume => Convert.ToInt32(m_VolumeFactor * _Volume);
+
+		internal void UpdateState(bool PublicAddress, bool Power, bool Mute, bool DoNotDisturb, int Volume, int Treble, int Bass, int Balance, int Source)
+		{
+			bool ValueChanged = false;
+
+			if(_PublicAddress != PublicAddress)
+			{
+				_PublicAddress = PublicAddress;
+				ValueChanged = true;
+			}
+			
+			if(_Power != Power)
+			{
+				_Power = Power;
+				ValueChanged = true;
+			}
+
+			if (_Mute != Mute)
+			{
+				_Mute = Mute;
+				ValueChanged = true;
+			}
+
+			if (_DoNotDisturb != DoNotDisturb)
+			{
+				_DoNotDisturb = DoNotDisturb;
+				ValueChanged = true;
+			}
+
+			if (_Volume != Volume)
+			{
+				_Volume = Volume;
+				ValueChanged = true;
+			}
+
+			if (_Treble != Treble)
+			{
+				_Treble = Treble;
+				ValueChanged = true;
+			}
+
+			if (_Bass != Bass)
+			{
+				_Bass = Bass;
+				ValueChanged = true;
+			}
+
+			if (_Balance != Balance)
+			{
+				_Balance = Balance;
+				ValueChanged = true;
+			}
+
+			if (_Source != Source)
+			{
+				_Source = Source;
+				ValueChanged = true;
+			}
+			
+			if(ValueChanged)
+			{
+				ZoneChanged?.Invoke(new ZoneChangedEventArgs(AmpID, ZoneID));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/MPRSGxZ.csproj b/NewLib/MPRSGxZ.csproj
new file mode 100644
index 0000000..f738bc6
--- /dev/null
+++ b/NewLib/MPRSGxZ.csproj
@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.IO.Ports" Version="6.0.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/NewLib/Ports/IPAmplifierPort.cs b/NewLib/Ports/IPAmplifierPort.cs
new file mode 100644
index 0000000..fe87a6f
--- /dev/null
+++ b/NewLib/Ports/IPAmplifierPort.cs
@@ -0,0 +1,98 @@
+using MPRSGxZ.Commands;
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+
+namespace MPRSGxZ.Ports
+{
+	internal class IPAmplifierPort : IPort
+	{
+		private TcpClient Client;
+		private IPEndPoint ServerEndpoint;
+		private NetworkStream Stream;
+		private StreamWriter Writer;
+		private StreamReader Reader;
+		private object PortLock = new object();
+
+		internal IPAmplifierPort(IPEndPoint ServerEndpoint)
+		{
+			Client = new TcpClient();
+			this.ServerEndpoint = ServerEndpoint;
+		}
+
+		public void Open()
+		{
+			Client.Connect(ServerEndpoint);
+			Stream = Client.GetStream();
+
+			Writer = new StreamWriter(Stream, System.Text.Encoding.ASCII);
+			Writer.NewLine = "\r\n";
+			Writer.AutoFlush = true;
+
+			Reader = new StreamReader(Stream, System.Text.Encoding.ASCII);
+
+			Writer.WriteLine();
+			Reader.ReadLine();
+
+			if (Reader.Peek() != '#')
+			{
+				throw new InvalidOperationException("The serial port is in an unknown state.");
+			}
+		}
+
+		public void Close()
+		{
+			Reader.Close();
+			Writer.Close();
+			Stream.Close();
+			Client.Close();
+		}
+
+		public CommandResponse[] ExecuteCommand(Command CommandToExecute)
+		{
+			lock (PortLock)
+			{
+				Writer.WriteLine(CommandToExecute);
+				var Echo = Reader.ReadLine();
+
+				if ($"#{(string)CommandToExecute}" != Echo)
+				{
+					throw new InvalidOperationException("The serial port is in an unknown state.");
+				}
+
+				CommandResponse[] Response = new CommandResponse[CommandToExecute.ExpectedLines];
+				for (int i = 0; i < CommandToExecute.ExpectedLines; i++)
+				{
+					var CurrentLine = Reader.ReadLine();
+
+					//
+					// Read the additional CR
+					//
+					if (Reader.Peek() != 13)
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					var ExtraNewline = Reader.ReadLine();
+
+					if (ExtraNewline != string.Empty)
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					if (!CurrentLine.StartsWith(@"#>") && !CurrentLine.EndsWith("\r"))
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					CurrentLine = CurrentLine.Replace(@"#>", string.Empty);
+
+					Response[i] = new CommandResponse(CurrentLine);
+				}
+
+				return Response;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Ports/IPort.cs b/NewLib/Ports/IPort.cs
new file mode 100644
index 0000000..eb12a85
--- /dev/null
+++ b/NewLib/Ports/IPort.cs
@@ -0,0 +1,11 @@
+using MPRSGxZ.Commands;
+
+namespace MPRSGxZ.Ports
+{
+    internal interface IPort
+    {
+        void Open();
+        void Close();
+        CommandResponse[] ExecuteCommand(Command CommandToExecute);
+    }
+}
\ No newline at end of file
diff --git a/NewLib/Ports/SerialAmplifierPort.cs b/NewLib/Ports/SerialAmplifierPort.cs
new file mode 100644
index 0000000..983b584
--- /dev/null
+++ b/NewLib/Ports/SerialAmplifierPort.cs
@@ -0,0 +1,78 @@
+using MPRSGxZ.Commands;
+using System;
+using System.IO.Ports;
+
+namespace MPRSGxZ.Ports
+{
+	internal class SerialAmplifierPort : IPort
+	{
+		private SerialPort Port;
+		private object PortLock = new object();
+
+		internal SerialAmplifierPort(string PortName)
+		{
+			Port = new SerialPort()
+			{
+				PortName = PortName,
+				BaudRate = 9600,
+				StopBits = StopBits.One,
+				Parity = Parity.None,
+				DataBits = 8,
+				Handshake = Handshake.None,
+				NewLine = "\r\n",
+				ReadTimeout = 100
+			};
+		}
+
+		public void Open()
+		{
+			Port.Open();
+
+			// Get the port into a known state
+			Port.WriteLine(string.Empty);
+			Port.ReadLine();
+
+			if (Port.BytesToRead != 1)
+			{
+				throw new InvalidOperationException("The serial port is in an unknown state.");
+			}
+		}
+
+		public void Close()
+		{
+			Port.Close();
+		}
+
+		public CommandResponse[] ExecuteCommand(Command CommandToExecute)
+		{
+			lock(PortLock)
+			{
+				Port.WriteLine(CommandToExecute);
+				var Echo = Port.ReadLine();
+
+				if($"#{(string)CommandToExecute}" != Echo)
+				{
+					throw new InvalidOperationException("The serial port is in an unknown state.");
+				}
+
+				CommandResponse[] Response = new CommandResponse[CommandToExecute.ExpectedLines];
+				for (int i = 0; i < CommandToExecute.ExpectedLines; i++)
+				{
+					var CurrentLine = Port.ReadLine();
+
+					if (!CurrentLine.StartsWith(@"#>") && !CurrentLine.EndsWith("\r"))
+					{
+						throw new InvalidOperationException("The serial port is in an unknown state.");
+					}
+
+					CurrentLine = CurrentLine.Replace("\r", string.Empty);
+					CurrentLine = CurrentLine.Replace(@"#>", string.Empty);
+
+					Response[i] = new CommandResponse(CurrentLine);
+				}
+
+				return Response;
+			}			
+		}
+	}
+}
\ No newline at end of file
diff --git a/NewLib/Ports/VirtualAmplifierPort.cs b/NewLib/Ports/VirtualAmplifierPort.cs
new file mode 100644
index 0000000..4f5c82f
--- /dev/null
+++ b/NewLib/Ports/VirtualAmplifierPort.cs
@@ -0,0 +1,74 @@
+using MPRSGxZ.Commands;
+using System;
+
+namespace MPRSGxZ.Ports
+{
+	internal class VirtualAmplifierPort : IPort
+	{
+		private object PortLock = new object();
+		private string[] VirtualAmplifierState;
+
+		internal VirtualAmplifierPort()
+		{
+			VirtualAmplifierState = new string[18];
+
+			for (int AmplifierID = 1; AmplifierID <= 3; AmplifierID++)
+			{
+				for (int ZoneID = 1; ZoneID <= 6; ZoneID++)
+				{
+					int Index = ((AmplifierID - 1) * 6) + ZoneID - 1;
+
+					VirtualAmplifierState[Index] = $"{AmplifierID}{ZoneID}000000001907070701";
+				}
+			}
+		}
+
+		public void Open()
+		{
+		}
+
+		public void Close()
+		{
+		}
+
+		public CommandResponse[] ExecuteCommand(Command CommandToExecute)
+		{
+			lock (PortLock)
+			{
+				CommandResponse[] Response = new CommandResponse[CommandToExecute.ExpectedLines];
+				string[] SimulatedReads = new string[CommandToExecute.ExpectedLines];
+
+				int Index = ((CommandToExecute.AmpID - 1) * 6) + Math.Max(0, CommandToExecute.ZoneID - 1);
+
+				//
+				// Set commands don't return any data
+				//
+				if (CommandToExecute.Type == CommandType.Set)
+				{
+					var ZoneState = VirtualAmplifierState[Index];
+					var ParsedState = new CommandResponse(ZoneState);
+
+					var NewValue = $"{CommandToExecute.Value:D2}";
+					ZoneState = ZoneState.Remove(CommandToExecute.ResponseIndex, 2).Insert(CommandToExecute.ResponseIndex, NewValue);
+					VirtualAmplifierState[Index] = ZoneState;
+				}
+				//
+				// If the command is not a set command it is a query
+				// So return 1 response (if querying a single zone) or 6 responses (if querying a whole amplifier)
+				//
+				else
+				{
+					Array.Copy(VirtualAmplifierState, Index, SimulatedReads, 0, CommandToExecute.ExpectedLines);
+
+					for (int i = 0; i < CommandToExecute.ExpectedLines; i++)
+					{
+						var CurrentLine = SimulatedReads[i];
+						Response[i] = new CommandResponse(CurrentLine);
+					}
+				}
+
+				return Response;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/SimAmp/Class1.cs b/SimAmp/Class1.cs
new file mode 100644
index 0000000..64b8c56
--- /dev/null
+++ b/SimAmp/Class1.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SimAmp
+{
+    public class Class1
+    {
+    }
+}
diff --git a/SimAmp/Properties/AssemblyInfo.cs b/SimAmp/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..724422d
--- /dev/null
+++ b/SimAmp/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+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("SimAmp")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("SimAmp")]
+[assembly: AssemblyCopyright("Copyright ©  2021")]
+[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("41f70638-9c9b-4b5c-8617-d392fe9de408")]
+
+// 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")]
diff --git a/SimAmp/SimAmp.csproj b/SimAmp/SimAmp.csproj
new file mode 100644
index 0000000..951749f
--- /dev/null
+++ b/SimAmp/SimAmp.csproj
@@ -0,0 +1,54 @@
+<?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>41f70638-9c9b-4b5c-8617-d392fe9de408</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>SimAmp</RootNamespace>
+    <AssemblyName>SimAmp</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </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.Xml.Linq"/>
+    <Reference Include="System.Data.DataSetExtensions"/>
+    
+    
+    <Reference Include="Microsoft.CSharp"/>
+    
+    <Reference Include="System.Data"/>
+    
+    <Reference Include="System.Net.Http"/>
+    
+    <Reference Include="System.Xml"/>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Class1.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ </Project>