diff --git a/index.html b/index.html
index 56b4058..4cae2e5 100644
--- a/index.html
+++ b/index.html
@@ -46,7 +46,7 @@
         <script  type="text/javascript" src="js/addloco.js"></script> 
         <script  type="text/javascript" src="js/emulator.js"></script>
         <script  type="text/javascript" src="js/exwebthrottle.js"></script>
-        <script type="text/javascript" src="js/pwa.js"></script>
+        <script  type="text/javascript" src="js/pwa.js"></script>
 
 <!--
     NOTE: You can replace the above links with these if you like if you will always run when
@@ -74,6 +74,7 @@
                 <li tabindex="0" class="throttle" id="throttle-nav"><span>Throttle</span></li>
                 <li tabindex="0" class="locomotives" id="loco-nav"><span>Locomotives</span></li>
                 <li tabindex="0" class="function-maps" id="fn-map-nav"><span>Function Maps</span></li>
+                <li tabindex="0" class="progtool" id="prog-nav"><span>CV Programmer</span></li>
                 <li tabindex="0" class="settings" id="settings-nav"><span>Settings</span></li>
             </ul>
         </nav>
@@ -239,7 +240,105 @@
                         </div>
                     </div>
                 </section>
-                
+
+                <section id="prog-window" class="section" hidden="true">
+                    <div class="row settings-heading">
+                        <div class="column-7 pl0 hdng">
+                            CV Programmer
+                        </div>
+                    </div>
+                    <div class="row settings-content">
+                        <div class="side-panel">
+                            <ul>
+                                <li id="settings-general">Programming Mode</li>
+                                <li id="settings-storage">Address Programming</li>
+                                <li id="settings-app">CV Programming</li>
+                            </ul>
+                        </div>
+
+                        <div class="settings-panel scrollbar" id="settings-panel">
+                            <div class="settings-section" id="progsettings-section">
+                                <div class="settings-subheading">
+                                    Programming Mode
+                                </div>
+                                <div class="settings-group">
+                                    <div class="row setting-entry">
+                                        <label class="setting-label">
+                                            Select Mode
+                                        </label>
+                                        <div class="setting-content">
+                                            <select id="progmode-selector" class="btn progmode-selector select-control" name="progmodeselector" title="Change Programming Mode">
+                                                <option value="ServiceMode"> Service Mode </option>
+                                                <option value="OpsMode"> Operations Mode </option>
+                                            </select> 
+                                        </div> 
+									</div>
+                                    <div class="row setting-entry" id="opsadrinput">
+										<label class="setting-label">
+											DCC Address
+										</label>
+										<div class="setting-content">
+											<input class="column-2 align-right" type="integer" id="opsaddress" placeholder="" name="opsaddress" required> 
+										</div> 
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="settings-section" id="addrprog-section">
+                                <div class="settings-subheading">
+                                    Address Programming
+                                </div>
+                                <div class="settings-group">
+                                    <div class="row setting-entry">
+                                        <label class="setting-label">
+                                            New DCC Address:
+                                        </label>
+                                        <div class="setting-content">
+                                            <input class="column-2 align-right" type="integer" id="dccaddress" name="dccaddress" required> 
+                                        </div> 
+                                    </div>
+                                    <div class="row setting-entry">
+                                        <label class="setting-label">
+                                            <button id="prog-read-addr">Read Address</button>
+                                        </label>
+                                        <label class="setting-label">
+                                            <button id="prog-write-addr">Write Address</button>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="settings-section" id="cvprog-section">
+                                <div class="settings-subheading">
+                                    CV Programming
+                                </div>
+                                <div class="settings-group">
+                                    <div class="row setting-entry">
+                                        <label class="setting-label">
+                                            CV #:
+                                        </label>
+                                        <div class="setting-content">
+                                            <input class="column-2 align-right" type="integer" id="cvaddress" name="cvaddress" required> 
+                                        </div> 
+                                        <label class="setting-label">
+                                            CV Value:
+                                        </label>
+                                        <div class="setting-content">
+                                            <input class="column-2 align-right" type="integer" id="cvvalue" name="cvvalue" required> 
+                                        </div> 
+                                    </div>
+                                    <div class="row setting-entry">
+                                        <label class="setting-label">
+                                            <button id="prog-read-cv">Read CV</button>
+                                        </label>
+                                        <label class="setting-label">
+                                            <button id="prog-write-cv">Write CV</button>
+                                        </label>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </section>
+            
                 <section id="loco-window" class="section" hidden="true">
                     <div class="row settings-heading">
                         <div class="column-7 pl0 hdng">
@@ -401,6 +500,17 @@ <h4 class="fn-heading add-loco-head">Add Locomotive</h4>
                                             </select>
                                         </div>
                                     </div>
+                                    <div class="row setting-entry">
+                                        <label class="setting-label">
+                                            Programming Track Mode
+                                        </label>
+                                        <div class="setting-content">
+                                            <select id="joinmode-selector" class="btn joinmode-selector select-control" name="joinmodeselector" title="Change Prog Track Mode">
+                                                <option value="joined"> JOIN Mode </option>
+                                                <option value="individual"> Programming only </option>
+                                            </select>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                             <div class="settings-section" id="storage-section">
diff --git a/js/commandController.js b/js/commandController.js
index 881b571..33a7f65 100644
--- a/js/commandController.js
+++ b/js/commandController.js
@@ -74,17 +74,58 @@ async function connectServer() {
     }
 }
 
+function parseCommand(thisCmd) {
+	console.log(thisCmd);
+	switch (thisCmd[1])
+	{
+//		case '*': console.log("COMMENT: " + thisCmd); break;
+		case 'r': 
+		{
+//			console.log("ADDRESS: " + thisCmd); 
+			var newVal = (thisCmd.slice(2, thisCmd.length - 1)).trimStart().split(" ");
+			dispAddrVal(newVal);
+			break;
+		}
+//		default: console.log("COMMAND: " + thisCmd); break;
+	}
+}
 // While there is still data in the serial buffer us an asynchronous read loop
 // to get the data and place it in the "value" variable. When "done" is true
 // all the data has been read or the port is closed
 async function readLoop() {
+	var cmdBuffer = "";
     while (true) {
         const { value, done } = await reader.read();
         // if (value && value.button) { // alternate check and calling a function
         // buttonPushed(value);
         if (value) {
+			cmdBuffer += value;
+//            console.log('[RECEIVE] '+ value);
+//            console.log(cmdBuffer);
+			var checkCmd = true;
+			while (checkCmd)
+			{
+				var start = cmdBuffer.indexOf('<', 0);
+//				console.log("start: ", start);
+				if (start >= 0)
+				{
+					var end = cmdBuffer.indexOf('>', start);
+//					console.log("end: ", end);
+					if (end > start)
+					{
+						var newCmd = cmdBuffer.substr(start, end - start + 1);
+						var remBuffer = cmdBuffer.substr(end + 1, cmdBuffer.length - end - 1);
+						cmdBuffer = remBuffer;
+//						console.log(cmdBuffer);
+						parseCommand(newCmd);
+					}
+					else
+						checkCmd = false;
+				}
+				else
+					checkCmd = false;
+			}
             displayLog('[RECEIVE] '+value);
-            console.log('[RECEIVE] '+value);
         }
         if (done) {
             console.log('[readLoop] DONE'+done.toString());
diff --git a/js/exwebthrottle.js b/js/exwebthrottle.js
index 6f0ec81..5094969 100644
--- a/js/exwebthrottle.js
+++ b/js/exwebthrottle.js
@@ -105,6 +105,7 @@ function setFunCurrentVal(fun, val){
 // Set given CV value
 function setCV(val){
     window.cv = val;
+    $("#opsaddress").prop('value', val);
     console.log("Set Cab Address: "+val);
 }
 // Get stored CV value
@@ -112,6 +113,13 @@ function getCV(){
     return window.cv
 }
 
+function dispAddrVal(newVal){
+	if (newVal.length == 1)
+		$("#dccaddress").prop('value', newVal[0]);
+	else
+		$("#cvvalue").prop('value', newVal[1]);
+}
+
 // Set Speed value
 function setSpeed(sp){
     window.speed=sp;
@@ -225,6 +233,20 @@ function setThrottleScreenUI() {
     $("#throttle-selector").val(controller).trigger("change");
     setspeedControllerType(controller);
 
+    if (getPreference("joinmode") == null) {
+        setPreference("joinmode", "individual");
+	}
+ 	isjoined = getPreference("joinmode");
+ 	setjoinModeType(isjoined);
+    $("#joinmode-selector").val(isjoined).trigger("change");
+
+    if (getPreference("progmode") == null) {
+        setPreference("progmode", "ServiceMode");
+	}
+ 	issmode = getPreference("progmode");
+ 	setprogModeType(issmode);
+    $("#progmode-selector").val(issmode).trigger("change");
+
     // Show and hide debug console based on preference set in earlier session
     if (getPreference("dbugConsole") == null) {
         setPreference("dbugConsole", true);
@@ -281,6 +303,47 @@ function setspeedControllerType(pref){
   }
 }
 
+function setprogModeType(pref){
+  switch (pref) {
+    case "ServiceMode":
+      console.log("Set Service mode programming");
+      $("#addrprog-section").show();
+      $("#prog-read-cv").show();
+      $("#opsadrinput").hide();
+      
+      break;
+    case "OpsMode":
+      console.log("Set OpsMode programming");
+      $("#addrprog-section").hide();
+      $("#prog-read-cv").hide();
+      $("#opsadrinput").show();
+      break;
+    case "default":
+    case null:
+    case undefined:
+      console.log("Fallback Prog Mode Type");
+      setPreference("progmode", "ServiceMode");
+      $("#progmode-selector").val("ServiceMode").trigger("change");
+  }
+}
+
+function setjoinModeType(pref){
+  switch (pref) {
+    case "joined":
+      console.log("Set Prog Track JOIN mode");
+      break;
+    case "individual":
+      console.log("Set Prog Track PROG only");
+      break;
+    case "default":
+    case null:
+    case undefined:
+      console.log("Fallback Join Mode Type");
+      setPreference("joinmode", "individual");
+      $("#joinmode-selector").val("joined").trigger("change");
+  }
+}
+
 // Enabling/disabling Speed Controllers
 function toggleThrottleState(state){
     if(state){
@@ -458,6 +521,21 @@ $(document).ready(function(){
     }
   });
 
+  $("#progmode-selector").on("change", function (e) {
+    selectedval = $(this).val();
+    console.log(selectedval);
+    setprogModeType(selectedval);
+    setPreference("progmode", selectedval);
+    
+  });
+
+  $("#joinmode-selector").on("change", function (e) {
+    selectedval = $(this).val();
+    console.log(selectedval);
+    setjoinModeType(selectedval);
+    setPreference("joinmode", selectedval);
+  });
+
   // Connect command station
   $("#button-connect").on("click", function () {
     toggleServer($(this));
@@ -499,13 +577,76 @@ $(document).ready(function(){
     pb = $(this).is(":checked");
 
     if (pb == true) {
-      writeToStream("1");
-      $("#power-status").html("On");
+		var joinmode = getPreference("joinmode");
+		console.log(joinmode);
+		if (joinmode == "individual")
+		{
+			writeToStream("1");
+			$("#power-status").html("On");
+		}
+		else
+		{
+			writeToStream("1 join");
+			$("#power-status").html("Joined");
+		}
     } else {
       writeToStream("0");
       $("#power-status").html("Off");
     }
   });
+
+  $("#prog-read-addr").on("click", function () {
+		$("#dccaddress").prop('value', "");
+		writeToStream("R");
+  });
+
+  $("#prog-read-cv").on("click", function () {
+		var cvNum = parseInt($("#cvaddress").val());
+		if ((cvNum > 0) && (cvNum <= 1024))
+		{
+			$("#cvvalue").prop('value', "");
+			writeToStream("R " + cvNum + " 0 0");
+		}
+		else
+			alert("Invalid CV (Range is from 1..1024)");
+  });
+
+  $("#prog-write-addr").on("click", function () {
+
+		var cvVal = parseInt($("#dccaddress").val());
+		if ((cvVal > 0) && (cvVal <= 10293))
+			writeToStream("W " + cvVal);
+		else
+			alert("Invalid Loco Address (Range is from 0..10293)");
+  });
+
+  $("#prog-write-cv").on("click", function () {
+
+		var serviceMode = getPreference("progmode") == "ServiceMode";
+		var opsAddr = parseInt($("#opsaddress").val());
+		if (((opsAddr > 0) && (opsAddr <= 10293)) || serviceMode)
+		{
+			var cvNum = parseInt($("#cvaddress").val());
+			if ((cvNum > 0) && (cvNum <= 1024))
+			{
+				var cvVal = parseInt($("#cvvalue").val());
+				if ((cvVal >= 0) && (cvVal <= 255))
+				{
+					if (serviceMode)
+						writeToStream("W " + cvNum + " " + cvVal);
+					else
+						writeToStream("w " + opsAddr + " " + cvNum + " " + cvVal);
+				}
+				else
+					alert("Invalid CV Value (Range is from 0..255)");
+			}
+			else
+				alert("Invalid CV (Range is from 1..1024)");
+		}
+		else
+			alert("Invalid Loco Address (Range is from 1..10293)");
+  });
+
   ////////////////////////////////////
   $("#v-throttle").slider({
     orientation: "vertical",
@@ -835,6 +976,11 @@ $(document).ready(function(){
     $("#settings-window").show();
     $("#nav-close").trigger("click");
   });
+  $("#prog-nav").on("click", function () {
+    hideWindows();
+    $("#prog-window").show();
+    $("#nav-close").trigger("click");
+  });
 
   eventListeners();
 
@@ -932,6 +1078,7 @@ function hideWindows(){
     $("#throttle-window").hide();
     $("#loco-window").hide();
     $("#fn-map-window").hide();
+    $("#prog-window").hide();
     $("#settings-window").hide();
 }