diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b2e489d..5107404 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,12 +22,32 @@ body:
       label: Hardware Version
       description: What version of the hardware are you running?
       options:
-        - Fourth Prototype (Purchased from Terence)
-        - Fourth Prototype (Purchased from third party)
-        - Fourth Prototype (Self-assembled)
         - Fifth Prototype (Purchased from Terence)
-        - Fifth Prototype (Purchased from third party)
         - Fifth Prototype (Self-assembled)
+        - Fifth Prototype (Purchased from third party)
+        - Fourth Prototype (Purchased from Terence)
+        - Fourth Prototype (Self-assembled)
+        - Fourth Prototype (Purchased from third party)
+    validations:
+      required: true
+  - type: dropdown
+    id: firmware-version
+    attributes:
+      label: Firmware Version
+      description: What version of the firmware are you running? (shown on boot screen)
+      options:
+        - 000F
+        - Older (not shown on boot, pre-2022-Feb-07)
+    validations:
+      required: true
+  - type: dropdown
+    id: driver-version
+    attributes:
+      label: Driver Version
+      description: What version of the driver are you running? Check with `RPI a2version`
+      options:
+        - 0022
+        - Older (error calling RPI a2version, pre-2022-Feb-07)
     validations:
       required: true
   - type: dropdown
diff --git a/Apple2/AT28C64B.bin b/Apple2/AT28C64B.bin
index 41aaea0..5c5901c 100644
Binary files a/Apple2/AT28C64B.bin and b/Apple2/AT28C64B.bin differ
diff --git a/Apple2/MenuFirmware.asm b/Apple2/MenuFirmware.asm
index 11abf23..63e55b8 100644
--- a/Apple2/MenuFirmware.asm
+++ b/Apple2/MenuFirmware.asm
@@ -159,15 +159,12 @@ finishRead:
 end:
  rts
 
-.repeat	187-<end
-.byte 0
-.endrepeat
-
+; NOTE: The text below exactly fills the remaining 256 bytes of firmware
 Text:
 .byte	"Apple2-IO-RPi",$8d
-.byte	"(c)2020-2021 Terence J. Boldt",$8d
+.byte	"(c)2020-2022 Terence J. Boldt",$8d
 .byte   $8d
-.byte	"Waiting for RPi...",$00
+.byte	"Waiting for RPi FW:000F...",$00
 
 .byte      0,0     ;0000 blocks = check status
 .byte      7       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
diff --git a/Apple2/MenuFirmware.lst b/Apple2/MenuFirmware.lst
index 22ee23f..c70c9a4 100644
--- a/Apple2/MenuFirmware.lst
+++ b/Apple2/MenuFirmware.lst
@@ -82,7 +82,7 @@ Current file: MenuFirmware.asm
 00C725  1  20 C1 FB      jsr BasCalc
 00C728  1  A0 00         ldy #$00
 00C72A  1               PrintString:
-00C72A  1  B9 BC C7      lda Text,y
+00C72A  1  B9 B4 C7      lda Text,y
 00C72D  1  F0 08         beq WaitForRPi
 00C72F  1  09 80         ora #$80
 00C731  1  20 ED FD      jsr PrintChar
@@ -163,29 +163,27 @@ Current file: MenuFirmware.asm
 00C7B3  1               end:
 00C7B3  1  60            rts
 00C7B4  1               
-00C7B4  1  00 00 00 00  .repeat	187-<end
-00C7B8  1  00 00 00 00  
-00C7BC  1               .byte 0
-00C7BC  1               .endrepeat
-00C7BC  1               
-00C7BC  1               Text:
-00C7BC  1  41 70 70 6C  .byte	"Apple2-IO-RPi",$8d
-00C7C0  1  65 32 2D 49  
-00C7C4  1  4F 2D 52 50  
-00C7C8  1  69 8D        
-00C7CA  1  28 63 29 32  .byte	"(c)2020-2021 Terence J. Boldt",$8d
-00C7CE  1  30 32 30 2D  
-00C7D2  1  32 30 32 31  
-00C7D6  1  20 54 65 72  
-00C7DA  1  65 6E 63 65  
-00C7DE  1  20 4A 2E 20  
-00C7E2  1  42 6F 6C 64  
-00C7E6  1  74 8D        
-00C7E8  1  8D           .byte   $8d
-00C7E9  1  57 61 69 74  .byte	"Waiting for RPi...",$00
-00C7ED  1  69 6E 67 20  
-00C7F1  1  66 6F 72 20  
-00C7F5  1  52 50 69 2E  
+00C7B4  1               ; NOTE: The text below exactly fills the remaining 256 bytes of firmware
+00C7B4  1               Text:
+00C7B4  1  41 70 70 6C  .byte	"Apple2-IO-RPi",$8d
+00C7B8  1  65 32 2D 49  
+00C7BC  1  4F 2D 52 50  
+00C7C0  1  69 8D        
+00C7C2  1  28 63 29 32  .byte	"(c)2020-2022 Terence J. Boldt",$8d
+00C7C6  1  30 32 30 2D  
+00C7CA  1  32 30 32 32  
+00C7CE  1  20 54 65 72  
+00C7D2  1  65 6E 63 65  
+00C7D6  1  20 4A 2E 20  
+00C7DA  1  42 6F 6C 64  
+00C7DE  1  74 8D        
+00C7E0  1  8D           .byte   $8d
+00C7E1  1  57 61 69 74  .byte	"Waiting for RPi FW:000F...",$00
+00C7E5  1  69 6E 67 20  
+00C7E9  1  66 6F 72 20  
+00C7ED  1  52 50 69 20  
+00C7F1  1  46 57 3A 30  
+00C7F5  1  30 30 46 2E  
 00C7F9  1  2E 2E 00     
 00C7FC  1               
 00C7FC  1  00 00        .byte      0,0     ;0000 blocks = check status
diff --git a/Apple2/RPi.Command.bin b/Apple2/RPi.Command.bin
index 8d938bc..fbf3950 100644
Binary files a/Apple2/RPi.Command.bin and b/Apple2/RPi.Command.bin differ
diff --git a/Apple2/RPi.Command.lst b/Apple2/RPi.Command.lst
index 9c2da1f..09664ff 100644
--- a/Apple2/RPi.Command.lst
+++ b/Apple2/RPi.Command.lst
@@ -92,13 +92,13 @@ Current file: RPi.Command.asm
 002041  1               end:
 002041  1  4C 00 03      jmp $0300
 002044  1               
-002044  1  00 00 00 00  .repeat	255-<end
+002044  1  00 00 00 00  .repeat	253-<end
 002048  1  00 00 00 00  
 00204C  1  00 00 00 00  
-002102  1               .byte 0
-002102  1               .endrepeat
-002102  1               
-002102  1               .org $0300
+002100  1               .byte 0
+002100  1               .endrepeat
+002100  1               
+002100  1               .org $0300
 000300  1                ;
 000300  1                ; FIRST SAVE THE EXTERNAL COMMAND ADDRESS SO YOU WON'T
 000300  1                ; DISCONNECT ANY PREVIOUSLY CONNECTED COMMAND.
diff --git a/RaspberryPi/Apple2-IO-RPi.hdv b/RaspberryPi/Apple2-IO-RPi.hdv
index 1503bd2..c6b3669 100755
Binary files a/RaspberryPi/Apple2-IO-RPi.hdv and b/RaspberryPi/Apple2-IO-RPi.hdv differ
diff --git a/RaspberryPi/apple2driver/driver.go b/RaspberryPi/apple2driver/driver.go
index 7a60955..9607892 100644
--- a/RaspberryPi/apple2driver/driver.go
+++ b/RaspberryPi/apple2driver/driver.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/a2io"
 	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/handlers"
+	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/info"
 )
 
 const resetCommand = 0
@@ -33,7 +34,7 @@ const shellCommand = 9
 func main() {
 	drive1, drive2 := getDriveFiles()
 
-	fmt.Printf("Starting Apple II RPi...\n")
+	fmt.Printf("Starting Apple II RPi v%s...\n", info.Version)
 
 	comm := a2io.A2Gpio{}
 
diff --git a/RaspberryPi/apple2driver/handlers/exec.go b/RaspberryPi/apple2driver/handlers/exec.go
index 4f1f0f0..6388361 100644
--- a/RaspberryPi/apple2driver/handlers/exec.go
+++ b/RaspberryPi/apple2driver/handlers/exec.go
@@ -14,6 +14,8 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/info"
 )
 
 var forceLowercase = false
@@ -46,6 +48,10 @@ func ExecCommand() {
 		comm.WriteString("Working directory set\r")
 		return
 	}
+	if linuxCommand == "a2version" {
+		a2version()
+		return
+	}
 	if linuxCommand == "a2help" {
 		a2help()
 		return
@@ -181,6 +187,10 @@ func getStdin(stdin io.WriteCloser, done chan bool, inputComplete chan bool, use
 	}
 }
 
+func a2version() {
+	comm.WriteString("\rVersion: " + info.Version + "\r")
+}
+
 func a2help() {
 	comm.WriteString("\r" +
 		"Built-in commands:\r" +
diff --git a/RaspberryPi/apple2driver/info/version.go b/RaspberryPi/apple2driver/info/version.go
new file mode 100644
index 0000000..fa9c573
--- /dev/null
+++ b/RaspberryPi/apple2driver/info/version.go
@@ -0,0 +1,9 @@
+// Copyright Terence J. Boldt (c)2020-2022
+// Use of this source code is governed by an MIT
+// license that can be found in the LICENSE file.
+
+// This file is used for storing the version number
+
+package info
+
+const Version = "0022"