diff --git a/Makefile b/Makefile
deleted file mode 100755
index 1fae5e1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-
-all: online.bin
-
-online.bin: online.asm
-	cl65 -o online.bin -t none --start-addr 0x2000 -l online.asm
-	cp template.po online.po
-	java -jar /Applications/AppleCommander.app/Contents/Resources/Java/AppleCommander.jar -p online.po online BIN 0x2000 < online.bin
-
-test:
-	/Applications/Virtual\ \]\[/Virtual\ \]\[.app/Contents/MacOS/Virtual\ \]\[ ./online.po 
-
-clean:
-	rm *.bin *.lst *.o online.po
diff --git a/online/Makefile b/online/Makefile
new file mode 100755
index 0000000..aa9a15a
--- /dev/null
+++ b/online/Makefile
@@ -0,0 +1,18 @@
+JAVA = java
+AC = /Applications/AppleCommander.app/Contents/Resources/Java/AppleCommander.jar
+TEMPLATE = ../shared/template.po
+VIRTUAL2 = /Applications/Virtual\ \]\[/Virtual\ \]\[.app/Contents/MacOS/Virtual\ \]\[
+
+all: online.bin
+
+online.bin: online.asm
+	cl65 -o online.bin -t none --start-addr 0x2000 -l online.asm
+	cp $(TEMPLATE) online.po
+	$(JAVA) -jar $(AC) -p online.po online BIN 0x2000 < online.bin
+
+test:
+	#$(VIRTUAL2) ./online.po 
+	osascript test.scpt "$(PWD)/online.po"
+
+clean:
+	rm *.bin *.lst *.o online.po
diff --git a/online.asm b/online/online.asm
similarity index 99%
rename from online.asm
rename to online/online.asm
index 7c848d0..3c1c21a 100644
--- a/online.asm
+++ b/online/online.asm
@@ -142,6 +142,7 @@ _CodeStartAddress:
 
 _CodeBeginAddress:
 entry:
+    cld			; For BASIC.SYSTEM's happiness
     ldx #0
 :   lda inbuf,x
     cmp #$e0		; Force input to UPPERCASE for comparison
diff --git a/online/test.scpt b/online/test.scpt
new file mode 100644
index 0000000..b5f1433
Binary files /dev/null and b/online/test.scpt differ
diff --git a/template.po b/shared/template.po
similarity index 100%
rename from template.po
rename to shared/template.po