diff --git a/.gitignore b/.gitignore
index fddb252..321a235 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,6 @@ software/MZB/*
 software/tmp/*
 software/asm/CPM22-BIOS.asm
 software/asm/MZ80AFI.asm.bak
-software/asm/cpm22.asm
 software/asm/cpm22.mzf
 software/asm/dz80.ini
 software/howto
diff --git a/software/asm/cpm22.asm b/software/asm/cpm22.asm
index 2361538..3a9151a 100644
--- a/software/asm/cpm22.asm
+++ b/software/asm/cpm22.asm
@@ -3738,7 +3738,7 @@ CKSUMTBL: DB   0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
            ALIGN_NOPS        CPMBIOS
 
 ;-----------------------------------------------------------------------
-;                         MZ-80A CPM BIOS
+;       MZ-80A CPM BIOS STUB - Main Logic in CBIOS.ASM
 ;-----------------------------------------------------------------------
 
            INCLUDE "Macros.asm"
diff --git a/software/config/diskdefs b/software/config/diskdefs
new file mode 100644
index 0000000..87cb4b3
--- /dev/null
+++ b/software/config/diskdefs
@@ -0,0 +1,77 @@
+
+# 320K Disk for the MZ80A - Same format as the MZ800
+# but implements a cylinder in uniform manner (ie. 1 cyl
+# = 1 track x 2(heads) where as the MZ800 implements as 
+# 160 tracks, 80 x Head 1 0->79 then 80 x Head 2 80->159.
+diskdef MZ80A-A
+  seclen 256
+  tracks 40
+  sectrk 32
+  blocksize 2048
+  maxdir 64
+  skew 0
+  boottrk 1
+  os 2.2
+end
+
+# A standard format 1.44Mb Floppy format for the MZ80A
+diskdef MZ80A-1440
+  seclen 512
+  tracks 80
+  sectrk 36
+  blocksize 2048
+  maxdir 128
+  skew 0
+  boottrk 0
+  os 2.2
+end
+
+# A standard format 720K Floppy format for the MZ80A.
+diskdef MZ80A-720
+  seclen 256
+  tracks 80
+  sectrk 36
+  blocksize 2048
+  maxdir 128
+  skew 0
+  boottrk 0
+  os 2.2
+end
+
+# A 240K Rom Filing System ROM Drive image.
+diskdef MZ80A-RFS
+  seclen 128
+  tracks 15
+  sectrk 128
+  blocksize 1024
+  maxdir 32
+  skew 0
+  boottrk 0
+  os 2.2
+end
+
+# Definition for the MZ800 CP/M Boot Disk. The reserved
+# track is in inverted data format but this is skipped in
+# CPM Tools.
+diskdef MZ800-BOOT
+  seclen 256
+  tracks 80
+  sectrk 16
+  blocksize 2048
+  maxdir 64
+  skew 0
+  boottrk 1
+  os 2.2
+end
+
+# Definition for the MZ800 CP/M Data disk. No reserved tracks.
+diskdef MZ800-DATA
+  seclen 256
+  tracks 80
+  sectrk 16
+  blocksize 2048
+  maxdir 64
+  skew 0ones, 1
+  boottrk 0
+  os 2.2
+end
diff --git a/software/hdr/CPM_RFS_2.HDR b/software/hdr/CPM_RFS_2.HDR
new file mode 100644
index 0000000..d1f5951
Binary files /dev/null and b/software/hdr/CPM_RFS_2.HDR differ