diff --git a/Binary/.gitignore b/Binary/.gitignore
deleted file mode 100644
index 53348db7..00000000
--- a/Binary/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bin
-*.eeprom
-*.img
-*.rom
diff --git a/Binary/Apps/.gitignore b/Binary/Apps/.gitignore
deleted file mode 100644
index 44b2d93d..00000000
--- a/Binary/Apps/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.com
-*.COM
diff --git a/Binary/Apps/Tunes/.gitignore b/Binary/Apps/Tunes/.gitignore
deleted file mode 100644
index 2e691325..00000000
--- a/Binary/Apps/Tunes/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pt*
-*.mym
diff --git a/Source/Apps/.gitignore b/Source/Apps/.gitignore
deleted file mode 100644
index bbe9d6aa..00000000
--- a/Source/Apps/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.COM
-*.lst
-*.hex
-*.com
diff --git a/Source/BL/.gitignore b/Source/BL/.gitignore
deleted file mode 100644
index 7e5922f7..00000000
--- a/Source/BL/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bin
-*.lst
diff --git a/Source/BL/Makefile b/Source/BL/Makefile
deleted file mode 100644
index 121a1051..00000000
--- a/Source/BL/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-OBJECTS = bl.bin
-DEST = ../../Binary/Apps
-TOOLS =../../Tools
-
-include $(TOOLS)/Makefile.inc
-
-#%.COM: %.asm
-#	$(TASM) $< $@
diff --git a/Source/BPBIOS/.gitignore b/Source/BPBIOS/.gitignore
deleted file mode 100644
index e1d7a6cb..00000000
--- a/Source/BPBIOS/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.prn
-*.rel
-*.img
-bpsys.bak
-bpsys.dat
-def-ww.lib
diff --git a/Source/BPBIOS/NZFCP13/.gitignore b/Source/BPBIOS/NZFCP13/.gitignore
deleted file mode 100644
index 567742ff..00000000
--- a/Source/BPBIOS/NZFCP13/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.lst
-*.rel
diff --git a/Source/BPBIOS/Z34RCP11/.gitignore b/Source/BPBIOS/Z34RCP11/.gitignore
deleted file mode 100644
index 567742ff..00000000
--- a/Source/BPBIOS/Z34RCP11/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.lst
-*.rel
diff --git a/Source/CBIOS/.gitignore b/Source/CBIOS/.gitignore
deleted file mode 100644
index 7e5922f7..00000000
--- a/Source/CBIOS/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bin
-*.lst
diff --git a/Source/CPM22/.gitignore b/Source/CPM22/.gitignore
deleted file mode 100644
index 461ebf40..00000000
--- a/Source/CPM22/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.bin
-*.hex
-*.lst
-*.sys
diff --git a/Source/CPM22/ccpb03.asm b/Source/CPM22/ccpb03.asm
index 76c25121..5fef8040 100644
--- a/Source/CPM22/ccpb03.asm
+++ b/Source/CPM22/ccpb03.asm
@@ -803,7 +803,7 @@ RESETDR:LD	A,(CHGDRV)	; DRIVE CHANGE INDICATED?
 ;**************************************************************
 ;
 	.IF	MON
-MONITOR:RST	$38
+MONITOR:RST	38H
 	.ENDIF
 
 ;
diff --git a/Source/CPM3/.gitignore b/Source/CPM3/.gitignore
deleted file mode 100644
index cea6e4e1..00000000
--- a/Source/CPM3/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-*.sym
-*.lst
-*.sys
-*.rel
-*.bin
-cpmldr.com
-gencpm.dat
-bios3.spr
-bnkbios3.spr
-options.lib
-zpmbios3.spr
diff --git a/Source/Forth/.gitignore b/Source/Forth/.gitignore
deleted file mode 100644
index cfc62af0..00000000
--- a/Source/Forth/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.bin
-*.sym
diff --git a/Source/HBIOS/.gitignore b/Source/HBIOS/.gitignore
deleted file mode 100644
index fd4dbec9..00000000
--- a/Source/HBIOS/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-*.bin
-*.lst
-*.rom
-*.dat
-*.tmp
-build.inc
-cpm.sys
-zsys.sys
diff --git a/Source/HBIOS/eastaegg.asm b/Source/HBIOS/eastaegg.asm
index 24744f11..23744cb5 100644
--- a/Source/HBIOS/eastaegg.asm
+++ b/Source/HBIOS/eastaegg.asm
@@ -17,6 +17,11 @@
 ;
 #include        "std.asm"
 
+; *** HACK TO GET THIS TO BUILD UNDER UNA ***
+#IF (BIOS == BIOS_UNA)
+#INCLUDE "hbios.inc"
+#ENDIF
+
 cr				.equ	0dh
 lf				.equ	0ah
 eos				.equ	00h
diff --git a/Source/HBIOS/nascom.asm b/Source/HBIOS/nascom.asm
index 76f66b9b..51517cc9 100644
--- a/Source/HBIOS/nascom.asm
+++ b/Source/HBIOS/nascom.asm
@@ -29,6 +29,11 @@
 ;
 #INCLUDE "std.asm"
 ;
+; *** HACK TO GET THIS TO BUILD UNDER UNA ***
+#IF (BIOS == BIOS_UNA)
+#INCLUDE "hbios.inc"
+#ENDIF
+;
 ; CUSTOMIZATION
 ;
 ABBRERR	.EQU	FALSE		; Choose between long error message and abbreviated error messages.
diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm
index 9fb43746..5b0a9420 100644
--- a/Source/HBIOS/romldr.asm
+++ b/Source/HBIOS/romldr.asm
@@ -316,6 +316,7 @@ MATD:	LD	B,A
 MATD1:	CP	10		; DO A RANGE CHECK
 	JR	NC,MATX		; NOT VALID, HANDLE IT BELOW
 ;
+#IF (BIOS == BIOS_WBW)
 	PUSH	BC
 	PUSH	AF			; HOW MANY DISK
 	LD	B,BF_SYSGET		; DEVICES DO WE
@@ -323,6 +324,9 @@ MATD1:	CP	10		; DO A RANGE CHECK
 	RST	08			; SYSTEM ?
 	POP	AF
 	POP	BC
+#ELSE
+	LD	E,9		; HACK TO HANDLE UNA, NEED TO FIX
+#ENDIF
 ;	JR	MATD2		; IF MORE THEN 9	; UNCOMMENT TO TEST DOUBLE CHAR ENTRY
 	CP	10		; THEN WE NEED TO GET
 	JR	NC,MATD2	; ANOTHER CHARACTER
@@ -441,7 +445,10 @@ MENU_N	.EQU	((MENU_E - MENU_S) / MENU_V)	; NUMBER OF MENU ITEMS
 ;   SYSTEM REBOOT HANDLER
 ;==================================================================================================
 ;
-REBOOT: LD	DE,STR_REBOOT		; POINT TO MESSAGE
+REBOOT:
+;
+#IF (BIOS == BIOS_WBW)
+	LD	DE,STR_REBOOT		; POINT TO MESSAGE
 	CALL	WRITESTR		; PRINT IT
 #IF (DSKYENABLE)
 	LD	HL,MSG_BOOT		; POINT TO BOOT MESSAGE	
@@ -450,6 +457,12 @@ REBOOT: LD	DE,STR_REBOOT		; POINT TO MESSAGE
 	LD	A,BID_BOOT		; BOOT BANK
 	LD	HL,0			; ADDRESS ZERO
 	CALL	HB_BNKCALL		; DOES NOT RETURN
+#ENDIF
+#IF (BIOS == BIOS_UNA)
+	; UMMM... NEED TO DO SOMETHING HERE...
+	LD	DE,STR_INVALID	; SET ERROR STRING MESSAGE
+	JP	MENU		; AND RESTART MENU LOOP
+#ENDIF
 ;
 ;==================================================================================================
 ;   ROM IMAGE LOAD HANDLER
diff --git a/Source/HBIOS/tastybasic.asm b/Source/HBIOS/tastybasic.asm
index 3366737b..7c907dfa 100644
--- a/Source/HBIOS/tastybasic.asm
+++ b/Source/HBIOS/tastybasic.asm
@@ -40,6 +40,11 @@ TBC_LOC			.equ 0
 #else									; RomWBW
 #include		"std.asm"
 #endif
+; *** HACK TO GET THIS TO BUILD UNDER UNA ***
+#IF (BIOS == BIOS_UNA)
+#INCLUDE "hbios.inc"
+#ENDIF
+
 				.org TBC_LOC
 start:
 				ld sp,stack				; ** Cold Start **
diff --git a/Source/Images/.gitignore b/Source/Images/.gitignore
deleted file mode 100644
index ea0c4b19..00000000
--- a/Source/Images/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.sys
-*.img
-blank144
-blankhd
diff --git a/Source/Prop/Spin/.gitignore b/Source/Prop/Spin/.gitignore
deleted file mode 100644
index aeab9be3..00000000
--- a/Source/Prop/Spin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.list
-*.eeprom
diff --git a/Source/ZCPR-DJ/.gitignore b/Source/ZCPR-DJ/.gitignore
deleted file mode 100644
index b533485d..00000000
--- a/Source/ZCPR-DJ/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.rel
-*.bin
diff --git a/Source/ZCPR/.gitignore b/Source/ZCPR/.gitignore
deleted file mode 100644
index 532702d2..00000000
--- a/Source/ZCPR/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.bin
-*.hex
-*.com
diff --git a/Source/ZPM3/.gitignore b/Source/ZPM3/.gitignore
deleted file mode 100644
index bd363121..00000000
--- a/Source/ZPM3/.gitignore
+++ /dev/null
@@ -1,19 +0,0 @@
-*.lst
-*.sym
-biosldr.rel
-bnkbios3.spr
-cpm3.sys
-gencpm.com
-gencpm.dat
-startzpm.com
-zccp.com
-zinstal.zpm
-zpmldr.com
-setz3.com
-clrhist.com
-autotog.com
-cpmldr.com
-biosldrc.rel
-biosldrd.rel
-loader.bin
-zpmldr.bin
diff --git a/Source/ZPM3/autotog.com b/Source/ZPM3/autotog.com
new file mode 100644
index 00000000..3c7a5980
Binary files /dev/null and b/Source/ZPM3/autotog.com differ
diff --git a/Source/ZPM3/clrhist.com b/Source/ZPM3/clrhist.com
new file mode 100644
index 00000000..02a39c83
Binary files /dev/null and b/Source/ZPM3/clrhist.com differ
diff --git a/Source/ZPM3/setz3.com b/Source/ZPM3/setz3.com
new file mode 100644
index 00000000..4ddb374f
Binary files /dev/null and b/Source/ZPM3/setz3.com differ
diff --git a/Source/ZPM3/zinstal.zpm b/Source/ZPM3/zinstal.zpm
new file mode 100644
index 00000000..1a6b2c4c
Binary files /dev/null and b/Source/ZPM3/zinstal.zpm differ
diff --git a/Source/ZSDOS/.gitignore b/Source/ZSDOS/.gitignore
deleted file mode 100644
index dad55a3c..00000000
--- a/Source/ZSDOS/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-*.bin
-*.rel
-*.prn
-*.sym
-*.sys
-*.lst
diff --git a/Tools/.gitignore b/Tools/.gitignore
deleted file mode 100644
index 24a162b6..00000000
--- a/Tools/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Darwin
-Linux
diff --git a/Tools/unix/cpmtools/.gitignore b/Tools/unix/cpmtools/.gitignore
deleted file mode 100644
index ccf80731..00000000
--- a/Tools/unix/cpmtools/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-cpmchattr
-cpmchmod
-cpmcp
-cpmls
-cpmrm
-fsck.cpm
-mkfs.cpm
-*.o
diff --git a/Tools/unix/uz80as/.gitignore b/Tools/unix/uz80as/.gitignore
deleted file mode 100644
index 853bc0e0..00000000
--- a/Tools/unix/uz80as/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-uz80as
diff --git a/Tools/unix/zx/.gitignore b/Tools/unix/zx/.gitignore
deleted file mode 100644
index 7b10942e..00000000
--- a/Tools/unix/zx/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.o
-zx
-config.h