diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php
index 05916d60..3e8a0839 100755
--- a/application/controllers/Qso.php
+++ b/application/controllers/Qso.php
@@ -155,6 +155,10 @@ class QSO extends CI_Controller {
         $this->load->view('qso/components/winkeysettings');
     }
 
+    function cwmacrosave(){
+        echo "lets save!";
+    }
+
     function edit_ajax() {
 
         $this->load->model('logbook_model');
diff --git a/application/views/qso/components/winkeysettings.php b/application/views/qso/components/winkeysettings.php
index ae80a9f1..f0e7ccff 100644
--- a/application/views/qso/components/winkeysettings.php
+++ b/application/views/qso/components/winkeysettings.php
@@ -1,16 +1,95 @@
 <div id="modal-backdrop" class="modal-backdrop fade show" style="display:block;"></div>
 <div id="modal" class="modal fade show" tabindex="-1" style="display:block;">
+<form hx-post="/index.php/qso/cwmacrosave" hx-target=".modal-body">
 	<div class="modal-dialog modal-dialog-centered">
 	  <div class="modal-content">
 		<div class="modal-header">
 		  <h5 class="modal-title">Winkey Macros</h5>
 		</div>
 		<div class="modal-body">
-		  <p>Modal body text goes here.</p>
+				<div class="form-group row">
+    				<label for="function1_name" class="col-sm-5 col-form-label">Function 1 - Name</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function1_name" maxlength="6">
+					</div>
+  				</div>
+
+				<div class="form-group row">
+    				<label for="function1_macro" class="col-sm-5 col-form-label">Function 1 - Macro</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function1_macro">
+					</div>
+  				</div>
+
+				<hr>
+
+				<div class="form-group row">
+    				<label for="function2_name" class="col-sm-5 col-form-label">Function 2 - Name</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function2_name" maxlength="6">
+					</div>
+  				</div>
+
+				<div class="form-group row">
+    				<label for="function2_macro" class="col-sm-5 col-form-label">Function 2 - Macro</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function2_macro">
+					</div>
+  				</div>
+
+				<hr>
+
+				<div class="form-group row">
+    				<label for="function3_name" class="col-sm-5 col-form-label">Function 3 - Name</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function3_name" maxlength="6">
+					</div>
+  				</div>
+
+				<div class="form-group row">
+    				<label for="function3_macro" class="col-sm-5 col-form-label">Function 3 - Macro</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function3_macro">
+					</div>
+  				</div>
+
+				<hr>
+
+				<div class="form-group row">
+    				<label for="function4_name" class="col-sm-5 col-form-label">Function 4 - Name</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function4_name" maxlength="6">
+					</div>
+  				</div>
+
+				<div class="form-group row">
+    				<label for="function4_macro" class="col-sm-5 col-form-label">Function 4 - Macro</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function4_macro">
+					</div>
+  				</div>
+
+				<hr>
+
+				<div class="form-group row">
+    				<label for="function5_name" class="col-sm-5 col-form-label">Function 5 - Name</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function5_name" maxlength="6">
+					</div>
+  				</div>
+
+				<div class="form-group row">
+    				<label for="function5_macro" class="col-sm-5 col-form-label">Function 5 - Macro</label>
+    				<div class="col-sm-7">
+						<input type="text" class="form-control" id="function5_macro">
+					</div>
+  				</div>
 		</div>
 		<div class="modal-footer">
-		  <button type="button" class="btn btn-secondary" onclick="closeModal()">Close</button>
+			<button type="submit" class="btn btn-primary">Save</button>
+			<button type="button" class="btn btn-secondary" onclick="closeModal()">Close</button>
 		</div>
 	  </div>
 	</div>
-  </div>
\ No newline at end of file
+	</form>
+</div>
diff --git a/application/views/qso/index.php b/application/views/qso/index.php
index 60969b10..e61c89c6 100755
--- a/application/views/qso/index.php
+++ b/application/views/qso/index.php
@@ -538,7 +538,6 @@
           <button onclick="morsekey_func3()" class="btn btn-warning">F3</button>
           <button onclick="morsekey_func4()" class="btn btn-warning">F4</button>
           <button onclick="morsekey_func5()" class="btn btn-warning">F5</button>
-          <button onclick="morsekey_func6()" class="btn btn-warning">F5</button>
           <br><br>
           <input id="sendText" type="text"><input id="sendButton" type="button" value="Send" class="btn btn-success">