diff --git a/mockingboard/Makefile b/mockingboard/Makefile
index 004de8a8..662a4096 100644
--- a/mockingboard/Makefile
+++ b/mockingboard/Makefile
@@ -11,7 +11,8 @@ mock.dsk:	KSP_THEME_UNCOMPRESSED
 KSP_THEME_UNCOMPRESSED:	ksp_theme_uncompressed.o
 	ld65 -o KSP_THEME_UNCOMPRESSED ksp_theme_uncompressed.o -C ./apple2_1000.inc
 
-ksp_theme_uncompressed.o:	ksp_theme_uncompressed.s
+ksp_theme_uncompressed.o:	ksp_theme_uncompressed.s \
+	../asm_routines/mockingboard.s
 	ca65 -o ksp_theme_uncompressed.o ksp_theme_uncompressed.s -l ksp_theme_uncompressed.lst
 
 ED:	duet.o
diff --git a/mockingboard/ksp_theme_uncompressed.s b/mockingboard/ksp_theme_uncompressed.s
index b430e0c0..7ec09f00 100644
--- a/mockingboard/ksp_theme_uncompressed.s
+++ b/mockingboard/ksp_theme_uncompressed.s
@@ -1,10 +1,4 @@
-; http://macgui.com/usenet/?group=2&id=8366
-
-; Mockingboad programming:
-; + Has two 6522 I/O chips connected to two AY-3-8910 chips
-; + Optionally has some speech chips controlled via the outport on the AY
-; + Often in slot 4
-;	TODO: how to auto-detect?
+; Play the KSP theme, but uncompressed (so pretty huge and slow to load)
 
 .include	"zp.inc"
 
@@ -116,154 +110,20 @@ done_play:
 forever_loop:
 	jmp	forever_loop
 
-
-
-; left speaker
-MOCK_6522_ORB1	EQU	$C400	; function to perform, OUT 1
-MOCK_6522_ORA1	EQU	$C401	; data, OUT 1
-MOCK_6522_DDRB1	EQU	$C402	; data direction, OUT 1
-MOCK_6522_DDRA1	EQU	$C403	; data direction, OUT 1
-
-; right speaker
-MOCK_6522_ORB2	EQU	$C480	; function to perform, OUT 2
-MOCK_6522_ORA2	EQU	$C481	; data, OUT 2
-MOCK_6522_DDRB2	EQU	$C482	; data direction, OUT 2
-MOCK_6522_DDRA2	EQU	$C483	; data direction, OUT 2
-
-; AY-3-8910 commands on port B
-;						RESET	BDIR	BC1
-MOCK_AY_RESET		EQU	$0	;	0	0	0
-MOCK_AY_INACTIVE	EQU	$4	;	1	0	0
-MOCK_AY_READ		EQU	$5	;	1	0	1
-MOCK_AY_WRITE		EQU	$6	;	1	1	0
-MOCK_AY_LATCH_ADDR	EQU	$7	;	1	1	1
-
-
-	;========================
-	; Mockingboard card
-	; Essentially two 6522s hooked to the Apple II bus
-	; Connected to AY-3-8910 chips
-	;	PA0-PA7 on 6522 connected to DA0-DA7 on AY
-	;	PB0     on 6522 connected to BC1
-	;	PB1	on 6522 connected to BDIR
-	;	PB2	on 6522 connected to RESET
-
-	;========================
-	; Mockingboard Init
-	;========================
-mockingboard_init:
-	; Initialize the 6522s
-	; set the data direction for all pins of PortA/PortB to be output
-	lda	#$ff		; all output (1)
-	sta	MOCK_6522_DDRB1
-	sta	MOCK_6522_DDRA1
-	sta	MOCK_6522_DDRB2
-	sta	MOCK_6522_DDRA2
-	rts
-
-	;======================
-	; Reset Left AY-3-8910
-	;======================
-reset_ay_left:
-	lda	#MOCK_AY_RESET
-	sta	MOCK_6522_ORB1
-	lda	#MOCK_AY_INACTIVE
-	sta	MOCK_6522_ORB1
-	rts
-
-	;======================
-	; Reset Right AY-3-8910
-	;======================
-reset_ay_right:
-	lda	#MOCK_AY_RESET
-	sta	MOCK_6522_ORB2
-	lda	#MOCK_AY_INACTIVE
-	sta	MOCK_6522_ORB2
-	rts
-
-
-;	Write sequence
-;	Inactive -> Latch Address -> Inactive -> Write Data -> Inactive
-
-	;=======================
-	; Write Right AY-3-8910
-	;=======================
-	; register in Y
-	; value in X
-
-write_ay_right:
-	; address
-	sty	MOCK_6522_ORA1		; put address on PA
-	lda	#MOCK_AY_LATCH_ADDR	; latch_address on PB
-	sta	MOCK_6522_ORB1
-	lda	#MOCK_AY_INACTIVE	; go inactive
-	sta	MOCK_6522_ORB1
-
-	; value
-	stx	MOCK_6522_ORA1		; put value on PA
-	lda	#MOCK_AY_WRITE		; write on PB
-	sta	MOCK_6522_ORB1
-	lda	#MOCK_AY_INACTIVE	; go inactive
-	sta	MOCK_6522_ORB1
-
-	rts
-
-	;=======================
-	; Write Left AY-3-8910
-	;=======================
-	; register in X
-	; value in Y
-
-write_ay_left:
-	; address
-	sty	MOCK_6522_ORA2		; put address on PA
-	lda	#MOCK_AY_LATCH_ADDR	; latch_address on PB
-	sta	MOCK_6522_ORB2
-	lda	#MOCK_AY_INACTIVE	; go inactive
-	sta	MOCK_6522_ORB2
-
-	; value
-	stx	MOCK_6522_ORA2		; put value on PA
-	lda	#MOCK_AY_WRITE		; write on PB
-	sta	MOCK_6522_ORB2
-	lda	#MOCK_AY_INACTIVE	; go inactive
-	sta	MOCK_6522_ORB2
-
-	rts
-
-	;=======================================
-	; clear ay -- clear all 14 AY registers
-	; should silence the card
-	;=======================================
-clear_ay_left:
-	ldy	#14
-	ldx	#0
-clear_ay_left_loop:
-	jsr	write_ay_left
-	dey
-	bpl	clear_ay_left_loop
-	rts
-
-	;=======================================
-	; clear ay -- clear all 14 AY registers
-	; should silence the card
-	;=======================================
-clear_ay_right:
-
-	ldy	#14
-	ldx	#0
-clear_ay_right_loop:
-	jsr	write_ay_right
-	dey
-	bpl	clear_ay_right_loop
-	rts
-
+;=========
 ;routines
+;=========
 .include	"../asm_routines/gr_offsets.s"
 .include	"../asm_routines/text_print.s"
+.include	"../asm_routines/mockingboard.s"
 
+;=======
 ; music
+;=======
 .include	"ksptheme_uncompressed.inc"
 
+;=========
+; strings
+;=========
 mocking_message:	.asciiz "ASSUMING MOCKINGBOARD IN SLOT #4"
 done_message:		.asciiz "DONE PLAYING"
diff --git a/mockingboard/mock_test.dsk b/mockingboard/mock_test.dsk
index bd8cb2e6..a9e7e476 100644
Binary files a/mockingboard/mock_test.dsk and b/mockingboard/mock_test.dsk differ