diff --git a/mode7_demo/Makefile b/mode7_demo/Makefile
index 8682938d..281f37c8 100644
--- a/mode7_demo/Makefile
+++ b/mode7_demo/Makefile
@@ -10,14 +10,14 @@ $(DOS33):
 	cd ../dos33fs-utils && make
 
 mode7_demo.dsk:	$(DOS33) MODE7_DEMO
-	$(DOS33) -y mode7_demo.dsk BSAVE -a 0x1000 MODE7_DEMO
+	$(DOS33) -y mode7_demo.dsk BSAVE -a 0x2000 MODE7_DEMO
 
 
 
 ###
 
 MODE7_DEMO:	mode7_demo.o
-	ld65 -o MODE7_DEMO mode7_demo.o -C ./apple2_1000.inc
+	ld65 -o MODE7_DEMO mode7_demo.o -C ./apple2_2000.inc
 
 mode7_demo.o:	mode7_demo.s mode7_demo_backgrounds.inc \
 		a2.scrolltext deater.scrolltext \
@@ -26,7 +26,8 @@ mode7_demo.o:	mode7_demo.s mode7_demo_backgrounds.inc \
 		../asm_routines/gr_setpage.s \
 		../asm_routines/gr_fade.s \
 		../asm_routines/gr_copy.s \
-		../asm_routines/gr_scroll.s
+		../asm_routines/gr_scroll.s \
+		mode7.s
 	ca65 -o mode7_demo.o mode7_demo.s -l mode7_demo.lst
 
 
diff --git a/mode7_demo/apple2_1000.inc b/mode7_demo/apple2_2000.inc
similarity index 81%
rename from mode7_demo/apple2_1000.inc
rename to mode7_demo/apple2_2000.inc
index e22976de..45689b1b 100644
--- a/mode7_demo/apple2_1000.inc
+++ b/mode7_demo/apple2_2000.inc
@@ -1,6 +1,6 @@
 MEMORY {
        ZP: start = $00, size = $1A, type = rw;
-       RAM: start = $1000, size = $8E00, file = %O;
+       RAM: start = $2000, size = $7E00, file = %O;
 }
 
 SEGMENTS {
diff --git a/mode7_demo/island_map.inc b/mode7_demo/island_map.inc
new file mode 100644
index 00000000..3a42dcf2
--- /dev/null
+++ b/mode7_demo/island_map.inc
@@ -0,0 +1,16 @@
+flying_map:
+	.byte $22,$ff,$ff,$ff, $ff,$ff,$ff,$22
+	.byte $dd,$cc,$cc,$88, $44,$44,$00,$dd
+	.byte $dd,$cc,$cc,$cc, $88,$44,$44,$dd
+	.byte $dd,$cc,$cc,$88, $44,$44,$44,$dd
+	.byte $dd,$cc,$99,$99, $88,$44,$44,$dd
+	.byte $dd,$cc,$99,$88, $44,$44,$44,$dd
+	.byte $dd,$cc,$99,$99, $11,$44,$44,$dd
+	.byte $22,$dd,$dd,$dd, $dd,$dd,$dd,$22
+
+
+water_map:
+	.byte $22,$22,$22,$22,  $22,$22,$22,$22
+	.byte $ee,$22,$22,$22,  $22,$22,$22,$22
+	.byte $22,$22,$22,$22,  $22,$22,$22,$22
+	.byte $22,$22,$22,$22,  $ee,$22,$22,$22
diff --git a/mode7_demo/mode7.s b/mode7_demo/mode7.s
new file mode 100644
index 00000000..ecbe74bd
--- /dev/null
+++ b/mode7_demo/mode7.s
@@ -0,0 +1,1101 @@
+;.include "zp.inc"
+
+;===========
+; CONSTANTS
+;===========
+CONST_SHIPX	EQU	15
+CONST_TILE_W	EQU	64
+CONST_TILE_H	EQU	64
+CONST_MAP_MASK_X	EQU	(CONST_TILE_W - 1)
+CONST_MAP_MASK_Y	EQU	(CONST_TILE_H - 1)
+CONST_LOWRES_W	EQU	40
+CONST_LOWRES_H	EQU	40
+CONST_BETA_I	EQU	$ff
+CONST_BETA_F	EQU	$80
+CONST_SCALE_I	EQU	$14
+CONST_SCALE_F	EQU	$00
+CONST_LOWRES_HALF_I	EQU	$ec	; -(LOWRES_W/2)
+CONST_LOWRES_HALF_F	EQU	$00
+
+	; pre-programmed directions
+
+flying_directions:
+	.byte	$20,$00, $1,'Z', $10,'D', $1,' ', $40,$00, $1,'Q'
+
+	;=====================
+	; Flying
+	;=====================
+
+mode7_flying:
+
+	;================================
+	; Clear screen and setup graphics
+	;================================
+
+	jsr	clear_screens		 ; clear top/bottom of page 0/1
+	jsr     set_gr_page0
+
+	;===============
+	; Init Variables
+	;===============
+	lda	#20
+	sta	SHIPY
+	lda	#0
+	sta	TURNING
+	sta	ANGLE
+	sta	SPACEX_I
+	sta	SPACEY_I
+	sta	CX_I
+	sta	CX_F
+	sta	CY_I
+	sta	CY_F
+	sta	DRAW_SPLASH
+	sta	SPEED
+	sta	SPLASH_COUNT
+	sta	DISP_PAGE
+	sta	KEY_COUNT
+	sta	KEY_OFFSET
+
+	lda	#1		; slightly off North for better view of island
+	sta	ANGLE
+
+	lda	#2		; initialize sky both pages
+	sta	DRAW_SKY
+
+	lda	#4		; starts out at 4.5 altitude
+	sta	SPACEZ_I
+	lda	#$80
+	sta	SPACEZ_F
+
+	jsr	update_z_factor
+
+flying_loop:
+
+	lda	SPLASH_COUNT						; 3
+	beq	flying_keyboard						; 2nt/3
+	dec	SPLASH_COUNT	; decrement splash count		; 5
+
+flying_keyboard:
+
+;	jsr	get_key		; get keypress				; 6
+
+	lda	KEY_COUNT
+	bne	done_key
+
+	ldy	KEY_OFFSET
+	lda	flying_directions,Y
+	sta	KEY_COUNT
+	iny
+	lda	flying_directions,Y
+	sta	LASTKEY
+	inc	KEY_OFFSET
+	inc	KEY_OFFSET
+
+done_key:
+	dec	KEY_COUNT
+	lda	LASTKEY							; 3
+
+	cmp	#('Q')							; 2
+	bne	check_up						; 3/2nt
+
+	; done
+	rts
+
+check_up:
+	cmp	#('W')							; 2
+	bne	check_down						; 3/2nt
+
+	;===========
+	; UP PRESSED
+	;===========
+
+	lda	SHIPY
+	cmp	#17
+	bcc	check_down	; bgt, if shipy>16
+	dec	SHIPY
+	dec	SHIPY		; move ship up
+	inc	SPACEZ_I	; incement height
+	jsr	update_z_factor
+	lda	#0
+	sta	SPLASH_COUNT
+
+check_down:
+	cmp	#('S')
+	bne	check_left
+
+	;=============
+	; DOWN PRESSED
+	;=============
+
+	lda	SHIPY
+	cmp	#28
+	bcs	splashy		; ble, if shipy < 28
+	inc	SHIPY
+	inc	SHIPY		; move ship down
+	dec	SPACEZ_I	; decrement height
+	jsr	update_z_factor
+	bcc	check_left
+
+splashy:
+	lda	#10
+	sta	SPLASH_COUNT
+
+check_left:
+	cmp	#('A')
+	bne	check_right
+
+	;=============
+	; LEFT PRESSED
+	;=============
+
+	lda	TURNING
+	bmi	turn_left
+	beq	turn_left
+
+	lda	#$0
+	sta	TURNING
+	clv
+	bvc	check_right
+
+turn_left:
+	lda	#253	; -3
+	sta	TURNING
+
+	dec	ANGLE
+
+check_right:
+	cmp	#('D')
+	bne	check_speedup
+
+	;==============
+	; RIGHT PRESSED
+	;==============
+
+	lda	TURNING		;; FIXME: optimize me
+	bpl	turn_right
+	lda	#0
+	sta	TURNING
+	clv
+	bvc	check_speedup
+
+turn_right:
+	lda	#3
+	sta	TURNING
+
+	inc	ANGLE
+
+check_speedup:
+	cmp	#('Z')
+	bne	check_speeddown
+
+	;=========
+	; SPEED UP
+	;=========
+	lda	#$8
+	cmp	SPEED
+	beq	check_speeddown
+	inc	SPEED
+
+check_speeddown:
+	cmp	#('X')
+	bne	check_brake
+
+	;===========
+	; SPEED DOWN
+	;===========
+
+	lda	SPEED
+	beq	check_brake
+	dec	SPEED
+
+check_brake:
+	cmp	#(' '+128)
+	bne	check_land
+
+	;============
+	; BRAKE
+	;============
+	lda	#$0
+	sta	SPEED
+
+check_land:
+	cmp	#13
+	bne	check_help
+
+check_help:
+	cmp	#('H')
+	bne	check_done
+
+check_done:
+
+	;================
+	; Wrap the Angle
+	;================
+	; FIXME: only do this in right/left routine?
+	lda	ANGLE							; 3
+	and	#$f							; 2
+	sta	ANGLE							; 3
+
+	;================
+	; Handle Movement
+	;================
+
+speed_move:
+	ldx	SPEED							; 3
+	beq	draw_background						; 2nt/3
+								;=============
+	lda	ANGLE	; dx.i=fixed_sin[(angle+4)&0xf].i; // cos()	; 3
+	clc								; 2
+	adc	#4							; 2
+	and	#$f							; 2
+	asl								; 2
+	tay								; 2
+	lda	fixed_sin_scale,Y					; 4
+	sta	DX_I							; 3
+	iny		; dx.f=fixed_sin[(angle+4)&0xf].f; // cos()	; 2
+	lda	fixed_sin_scale,Y					; 4
+	sta	DX_F							; 3
+
+	lda	ANGLE	; dy.i=fixed_sin[angle&0xf].i; // sin()		; 3
+	and	#$f							; 2
+	asl								; 2
+	tay								; 2
+	lda	fixed_sin_scale,Y					; 4
+	sta	DY_I							; 3
+	iny		; dx.f=fixed_sin[angle&0xf].f; // sin()		; 2
+	lda	fixed_sin_scale,Y					; 4
+	sta	DY_F							; 3
+								;============
+								;	 54
+speed_loop:
+
+	clc			; fixed_add(&cx,&dx,&cx);		; 2
+	lda	CX_F							; 3
+	adc	DX_F							; 3
+	sta	CX_F							; 3
+	lda	CX_I							; 3
+	adc	DX_I							; 3
+	sta	CX_I							; 3
+
+	clc			; fixed_add(&cy,&dy,&cy);		; 2
+	lda	CY_F							; 3
+	adc	DY_F							; 3
+	sta	CY_F							; 3
+	lda	CY_I							; 3
+	adc	DY_I							; 3
+	sta	CY_I							; 3
+
+	dex								; 2
+	bne	speed_loop						; 2nt/3
+								;============
+								;	45
+
+	;====================
+	; Draw the background
+	;====================
+draw_background:
+	jsr	draw_background_mode7					; 6
+
+check_over_water:
+	;	See if we are over water
+	lda	CX_I							; 3
+	sta	SPACEX_I						; 3
+	lda	CY_I							; 3
+	sta	SPACEY_I						; 3
+
+	jsr	lookup_map						; 6
+
+	sec								; 2
+	sbc	#COLOR_BOTH_DARKBLUE					; 2
+	sta	OVER_LAND						; 3
+								;===========
+								;	31
+
+	; Calculate whether to draw the splash
+
+	lda	#0			; set splash drawing to 0	; 2
+	sta	DRAW_SPLASH						; 3
+
+	lda	SPEED			; if speed==0, no splash	; 3
+	beq	no_splash						; 2nt/3
+
+	lda	TURNING							; 3
+	beq	no_turning_splash					; 2nt/3
+
+	lda	SHIPY							; 3
+	cmp	#27							; 2
+	bcc	no_turning_splash	; blt if shipy<25 skip		; 2nt/3
+
+	lda	#1							; 2
+	sta	SPLASH_COUNT						; 3
+
+no_turning_splash:
+	lda	OVER_LAND	; no splash if over land		; 3
+	bne	no_splash						; 2nt/3
+
+	lda	SPLASH_COUNT	; no splash if splash_count expired	; 3
+	beq	no_splash						; 2nt/3
+
+	lda	#1							; 2
+	sta	DRAW_SPLASH						; 3
+
+no_splash:
+
+	;==============
+	; Draw the ship
+	;==============
+
+	clv								; 2
+	lda	TURNING							; 3
+	beq	draw_ship_forward					; 2nt/3
+	bpl	draw_ship_right						; 2nt/3
+	bmi	draw_ship_left		;; FIXME: optimize order	; 2nt/3
+
+draw_ship_forward:
+	lda	DRAW_SPLASH						; 2
+	beq	no_forward_splash					; 2nt/3
+
+	; Draw Splash
+	lda     #>splash_forward					; 2
+        sta     INH							; 3
+        lda     #<splash_forward					; 2
+        sta     INL							; 3
+	lda	#(CONST_SHIPX+1)					; 2
+	sta	XPOS							; 3
+	clc								; 2
+	lda	SHIPY							; 3
+	adc	#9							; 2
+	and	#$fe			; make sure it's even		; 2
+	sta	YPOS							; 3
+	jsr	put_sprite						; 6
+								;==========
+								;	33
+no_forward_splash:
+	; Draw Shadow
+	lda     #>shadow_forward					; 2
+        sta     INH							; 3
+        lda     #<shadow_forward					; 2
+        sta     INL							; 3
+	lda	#(CONST_SHIPX+3)					; 2
+	sta	XPOS							; 3
+	clc								; 2
+	lda	SPACEZ_I						; 3
+	adc	#31							; 2
+	and	#$fe			; make sure it's even		; 2
+	sta	YPOS							; 3
+	jsr	put_sprite						; 6
+
+	lda     #>ship_forward						; 2
+        sta     INH							; 3
+        lda     #<ship_forward						; 2
+        sta     INL							; 3
+	bvc	draw_ship						; 3
+								;===========
+								;	46
+draw_ship_right:
+	lda	DRAW_SPLASH						; 3
+	beq	no_right_splash						; 2nt/3
+
+	; Draw Splash
+	lda     #>splash_right						; 2
+        sta     INH							; 3
+        lda     #<splash_right						; 2
+        sta     INL							; 3
+	lda	#(CONST_SHIPX+1)					; 2
+	sta	XPOS							; 3
+	clc								; 2
+	lda	#36							; 2
+	sta	YPOS							; 3
+	jsr	put_sprite						; 6
+								;===========
+								;	28
+no_right_splash:
+
+	; Draw Shadow
+	lda     #>shadow_right						; 2
+        sta     INH							; 3
+        lda     #<shadow_right						; 2
+        sta     INL							; 3
+	lda	#(CONST_SHIPX+3)					; 2
+	sta	XPOS							; 3
+	clc								; 2
+	lda	SPACEZ_I						; 3
+	adc	#31							; 2
+	and	#$fe			; make sure it's even		; 2
+	sta	YPOS							; 3
+	jsr	put_sprite						; 6
+
+	lda     #>ship_right						; 2
+        sta     INH							; 3
+        lda     #<ship_right						; 2
+        sta     INL							; 3
+
+	dec	TURNING							; 5
+
+	bvc	draw_ship						; 3
+								;==========
+								;	51
+draw_ship_left:
+	lda	DRAW_SPLASH						; 3
+	beq	no_left_splash						; 2nt/3
+
+	; Draw Splash
+	lda     #>splash_left						; 2
+        sta     INH							; 3
+        lda     #<splash_left						; 2
+        sta     INL							; 3
+	lda	#(CONST_SHIPX+1)					; 2
+	sta	XPOS							; 3
+	clc								; 2
+	lda	#36							; 2
+	sta	YPOS							; 3
+	jsr	put_sprite						; 6
+								;===========
+								;	 28
+no_left_splash:
+
+	; Draw Shadow
+	lda     #>shadow_left						; 2
+        sta     INH							; 3
+        lda     #<shadow_left						; 2
+        sta     INL							; 3
+	lda	#(CONST_SHIPX+3)					; 2
+	sta	XPOS							; 3
+	clc								; 2
+	lda	SPACEZ_I						; 3
+	adc	#31							; 2
+	and	#$fe			; make sure it's even		; 2
+	sta	YPOS							; 3
+	jsr	put_sprite						; 6
+
+	lda     #>ship_left						; 2
+        sta     INH							; 3
+        lda     #<ship_left						; 2
+        sta     INL							; 3
+
+	inc	TURNING							; 5
+								;==========
+								;	 48
+
+draw_ship:
+	lda	#CONST_SHIPX						; 2
+	sta	XPOS							; 3
+	lda	SHIPY							; 3
+	sta	YPOS							; 3
+	jsr	put_sprite						; 6
+								;===========
+								;	17
+
+	;==================
+	; flip pages
+	;==================
+
+	jsr	page_flip						; 6
+
+	;==================
+	; loop forever
+	;==================
+
+	jmp	flying_loop						; 3
+
+
+update_z_factor:
+
+	; we only do the following if Z changes
+
+	; fixed_mul(&space_z,&BETA,&factor);
+;mul1
+	lda	SPACEZ_I						; 3
+	sta	NUM1H							; 3
+
+	; interlude, update SPACEZ_SHIFTED
+	asl								; 2
+	asl								; 2
+	asl								; 2
+	asl								; 2
+	asl								; 2
+	sec								; 2
+	sbc	#8							; 2
+	sta	spacez_shifted+1					; 4
+
+
+	lda	SPACEZ_F						; 3
+	sta	NUM1L							; 3
+
+	lda	#CONST_BETA_I	; BETA_I				; 2
+	sta	NUM2H							; 3
+	lda	#CONST_BETA_F	; BETA_F				; 2
+	sta	NUM2L							; 3
+
+	sec			; don't reuse old values		; 2
+	jsr	multiply						; 6
+
+	stx	FACTOR_I						; 3
+	sta	FACTOR_F						; 3
+
+	rts								; 6
+								;===========
+								;        60
+
+
+;===========================
+; Draw the Mode7 Background
+;===========================
+
+draw_background_mode7:
+
+	; Only draw sky if necessary
+	; (at start, or if we have switched to text, we never overwrite it)
+
+	lda	DRAW_SKY						; 3
+	beq	no_draw_sky						;^2nt/3
+								;==============
+								;	  6
+
+.if .def(CHECKERBOARD_MAP)
+	lda	#0
+	sta	CV
+
+	jsr	scroll_background
+
+.else
+	; Draw Sky
+	; not performance critical as this happens rarely
+
+	dec	DRAW_SKY	; usually 2 as we redraw both pages	; 5
+	lda	#COLOR_BOTH_MEDIUMBLUE	; MEDIUMBLUE color		; 2
+	sta	COLOR							; 3
+	lda	#0							; 2
+								;===========
+								;	 11
+
+sky_loop:				; draw line across screen
+	ldy	#39			; from y=0 to y=6		; 2
+	sty	V2							; 3
+	ldy	#0							; 2
+	pha								; 3
+	jsr	hlin_double		; hlin y,V2 at A	; 63+(X*16)
+	pla								; 4
+	clc								; 2
+	adc	#2							; 2
+	cmp	#6							; 2
+	bne	sky_loop						; 3/2nt
+								;=============
+								; (23+63+(X*16))*5
+	; Draw Hazy Horizon
+
+	lda	#COLOR_BOTH_GREY	; Horizon is Grey		; 2
+	sta	COLOR							; 3
+	lda	#6			; draw single line at 6/7	; 2
+	ldy	#39							; 2
+	sty	V2			; hlin	Y,V2 at A		; 3
+	ldy	#0							; 2
+	jsr	hlin_double		; hlin	0,40 at 6	; 63+(X*16)
+								;===========
+								; 63+(X*16)+14
+
+.endif
+
+no_draw_sky:
+
+	; setup initial odd/even color mask
+	lda	#$f0							; 2
+	sta	COLOR_MASK						; 3
+
+	; start Y at 8 (below horizon line)
+	lda	#8							; 2
+	sta	SCREEN_Y						; 3
+								;=============
+								;	 10
+
+screeny_loop:
+	and	#$fe		; be sure SCREEN_Y used later is even	; 2
+	tay			; put in Y for lookup table later	; 2
+
+	lda	COLOR_MASK	; flip mask for odd/even row plotting	; 3
+	eor	#$ff							; 2
+	sta	COLOR_MASK						; 3
+	sta	mask_label+1	; setup self-modifying code		; 4
+
+	eor	#$ff		; setup self-modifying branch later	; 2
+	bmi	odd_branch	; beq is $f0 (too clever FIXME)		; 2nt/3
+	lda	#$d0		; bne is $d0				; 2
+odd_branch:
+	sta	mask_branch_label	; actually update branch	; 4
+								;============
+								;	 27
+
+setup_gr_addr:
+	lda	gr_offsets,Y	; lookup low-res memory row address	; 4
+	sta	GBASL		; store in GBASL zero-page pointer	; 3
+	iny			; point to high part of address		; 2
+
+	lda	gr_offsets,Y	; load high part of address		; 4
+	clc			; clear carry for add			; 2
+	adc	DRAW_PAGE       ; add in draw page offset               ; 3
+	sta	GBASH		; store in GBASH zero-page pointer	; 3
+
+								;=============
+								;	 21
+
+calc_horizontal_scale:
+
+	; Calculate the horizontal scale using a lookup table
+
+	; horizontal_scale.i *ALWAYS* = 0
+
+	;	unsigned char horizontal_lookup[7][32];
+	;horizontal_scale.f=
+	;	horizontal_lookup[space_z.i&0xf][(screen_y-8)/2];
+	;		horizontal_lookup[(space_z<<5)+(screen_y-8)]
+
+
+	clc								; 2
+	lda	SCREEN_Y						; 3
+spacez_shifted:
+	adc	#0	; self-modify, loads (spacez<<5)-8		; 2
+	tay								; 2
+	lda	horizontal_lookup,Y					; 4
+	sta	NUM1L	; HORIZ_SCALE_F is input to next mul		; 3
+								;============
+								;	 16
+
+; mul2
+	; calculate the distance of the line we are drawing
+	; fixed_mul(&horizontal_scale,&scale,&distance);
+	lda	#0	; HORIZ_SCALE_I is always zero			; 2
+	sta	NUM1H							; 3
+	; NUM1L was set to HORIZ_SCALE_F previously			;
+	lda	#CONST_SCALE_I	; SCALE_I				; 2
+	sta	NUM2H							; 3
+	lda	#CONST_SCALE_F	; SCALE_F				; 2
+	sta	NUM2L							; 3
+	sec			; don't reuse previous settings		; 2
+	jsr	multiply						; 6
+	stx	DISTANCE_I						; 2
+	sta	DISTANCE_F						; 2
+								;==========
+								;	 27
+
+	; calculate the dx and dy to add to points in space
+	; we add to the starting values on each row to get the next
+	; space values
+
+	; dx.i=fixed_sin[(angle+8)&0xf].i	// -sin()
+	lda	ANGLE							; 3
+	clc								; 2
+	adc	#8							; 2
+	and	#$f							; 2
+	asl								; 2
+	tay								; 2
+	lda	fixed_sin,Y	; load integer half			; 4
+	sta	NUM2H		; use as source in upcomnig mul		; 3
+
+
+	; dx.f=fixed_sin[(angle+8)&0xf].f; 	// -sin()
+	iny			; point to float half			; 2
+	lda	fixed_sin,Y	; load it from lookup table		; 4
+	sta	NUM2L		; use as source in upcoming mul		; 3
+								;==========
+								;	 29
+
+;mul3
+	; fixed_mul(&dx,&horizontal_scale,&dx);
+
+				; DX_I:DX_F already set in NUM2H:NUM2L
+	clc			; reuse HORIZ_SCALE in NUM1		; 2
+	jsr	multiply						; 6
+	stx	DX_I							; 3
+	sta	DX_F							; 3
+								;==========
+								;	 14
+
+	; dy.i=fixed_sin[(angle+4)&0xf].i; // cos()
+
+	lda	ANGLE							; 3
+	clc								; 2
+	adc	#4							; 2
+	and	#$f							; 2
+	asl								; 2
+	tay								; 2
+	lda	fixed_sin,Y	; load integer half			; 4
+	sta	NUM2H		; use as source in upcoming mul		; 3
+
+	; dy.f=fixed_sin[(angle+4)&0xf].f; // cos()
+
+	iny			; point to float half			; 2
+	lda	fixed_sin,Y	; load from lookup table		; 4
+	sta	NUM2L		; use as source in upcoming mul		; 3
+								;==========
+								;	 29
+;mul4
+	; fixed_mul(&dy,&horizontal_scale,&dy);
+
+				; DY_I:DY_F already in NUM2H:NUM2L
+	clc			; reuse horiz_scale in num1		; 2
+	jsr	multiply						; 6
+	stx	DY_I							; 3
+	sta	DY_F							; 3
+								;==========
+								;	 14
+
+	;=================================
+	; calculate the starting position
+	;=================================
+
+			; fixed_add(&distance,&factor,&space_x);
+	clc		; fixed_add(&distance,&factor,&space_y);	; 2
+	lda	DISTANCE_F						; 3
+	adc	FACTOR_F						; 3
+	sta	SPACEY_F						; 3
+	sta	SPACEX_F						; 3
+
+	lda	DISTANCE_I						; 3
+	adc	FACTOR_I						; 3
+	sta	SPACEY_I						; 3
+	sta	SPACEX_I						; 3
+								;==========
+								;	 26
+
+
+	; temp.i=fixed_sin[(angle+4)&0xf].i; // cos()
+
+	lda	ANGLE							; 3
+	clc								; 2
+	adc	#4							; 2
+	and	#$f							; 2
+	asl								; 2
+	tay								; 2
+	lda	fixed_sin,Y						; 4
+	sta	NUM2H	; store as source for next mul			; 3
+
+
+	; temp.f=fixed_sin[(angle+4)&0xf].f; // cos()
+	iny								; 2
+	lda	fixed_sin,Y						; 4
+	sta	NUM2L	; store as source for next mul			; 3
+								;==========
+								;	 29
+
+; mul5
+	; fixed_mul(&space_x,&temp,&space_x);
+	lda	SPACEX_I						; 3
+	sta	NUM1H							; 3
+	lda	SPACEX_F						; 3
+	sta	NUM1L							; 3
+			; NUM2H:NUM2L already set above
+	sec		; don't reuse previous NUM1			; 2
+	jsr	multiply						; 6
+			; SPACEX_I in X					;
+			; SPACEX_F in A					;
+								;==========
+								;	 20
+
+	; fixed_add(&space_x,&cx,&space_x);
+	clc								; 2
+			; SPACEX_F still in A				;
+	adc	CX_F							; 3
+	sta	SPACEX_F						; 3
+	txa		; SPACEX_I was in X				; 2
+	adc	CX_I							; 3
+	sta	SPACEX_I						; 3
+								;===========
+								;	 16
+
+
+	; temp.i=fixed_sin[angle&0xf].i; // sin()
+	lda	ANGLE							; 3
+	and	#$f							; 2
+	asl								; 2
+	tay								; 2
+	lda	fixed_sin,Y						; 4
+	sta	NUM2H		; store for next mul			; 3
+
+	; fixed_temp.f=fixed_sin[angle&0xf].f; // sin()
+	iny								; 2
+	lda	fixed_sin,Y						; 4
+	sta	NUM2L		; store for next mul			; 3
+								;==========
+								;	 25
+
+;mul6
+	; fixed_mul(&space_y,&fixed_temp,&space_y);
+	lda	SPACEY_I						; 3
+	sta	NUM1H							; 3
+	lda	SPACEY_F						; 3
+	sta	NUM1L							; 3
+				; NUM2H:NUM2L already set
+	sec			; don't reuse previous num1		; 2
+	jsr	multiply						; 6
+				; SPACEY_I in X				;
+				; SPACEY_F in A				;
+								;==========
+								;	 20
+
+	; fixed_add(&space_y,&cy,&space_y);
+	clc								; 2
+				; SPACEY_F in A
+	adc	CY_F							; 3
+	sta	SPACEY_F						; 3
+	txa			; SPACEY_I in X				; 2
+	adc	CY_I							; 3
+	sta	SPACEY_I						; 3
+								;==========
+								;	 16
+; mul7
+	; fixed_mul(&lowres_half,&dx,&temp);
+	lda	#CONST_LOWRES_HALF_I					; 2
+	sta	NUM1H							; 3
+	lda	#CONST_LOWRES_HALF_F					; 2
+	sta	NUM1L							; 3
+	lda	DX_I							; 3
+	sta	NUM2H							; 3
+	sta	dxi_label+1	; for self modify			; 4
+	lda	DX_F							; 3
+	sta	dxf_label+1	; for self modify			; 4
+	sta	NUM2L							; 3
+	sec			; don't reuse previous num1		; 2
+	jsr	multiply						; 6
+				; TEMP_I in X				;
+				; TEMP_F in A				;
+								;==========
+								;	 38
+
+
+	; fixed_add(&space_x,&temp,&space_x);
+	clc								; 2
+				; TEMP_F in A
+	adc	SPACEX_F						; 3
+	sta	SPACEX_F						; 3
+	txa			; TEMP_I in X				; 2
+	adc	SPACEX_I						; 3
+	sta	SPACEX_I						; 3
+								;==========
+								;	 16
+
+;mul8
+	; fixed_mul(&fixed_temp,&dy,&fixed_temp);
+	lda	DY_I							; 3
+	sta	NUM2H							; 3
+	sta	dyi_label+1	; for self modify			; 4
+	lda	DY_F							; 3
+	sta	NUM2L							; 3
+	sta	dyf_label+1	; for self modify			; 4
+	clc	; reuse CONST_LOWRES_HALF from last time		; 2
+	jsr	multiply						; 6
+			; TEMP_I in X
+			; TEMP_F in A
+								;==========
+								;	 28
+
+	; fixed_add(&space_y,&temp,&space_y);
+	clc								; 2
+			; TEMP_F in A
+	adc	SPACEY_F						; 3
+	sta	SPACEY_F						; 3
+
+	txa		; TEMP_I in X					; 2
+	adc	SPACEY_I						; 3
+	sta	SPACEY_I						; 3
+
+								;==========
+								;	 16
+
+
+	ldx	#40	; was SCREEN_X					; 2
+								;==========
+								;	  2
+	;===================================================
+	; SCREEN_X LOOP!!!!
+	;   every cycle in here counts for 32*40=1280 cycles
+	;===================================================
+screenx_loop:
+
+
+nomatch:
+	; Get color to draw in A
+.if .def(ISLAND_MAP)
+	.include "island_lookup.s"
+.elseif .def(CHECKERBOARD_MAP)
+	.include "checkerboard_lookup.s"
+.endif
+
+match:
+
+mask_label:
+	and	#0	; COLOR_MASK (self modifying)			; 2
+
+	ldy	#0							; 2
+mask_branch_label:
+	beq	big_bottom	; this branch is modified based on odd/even
+				; F0=beq, D0=bne			; 2nt/3
+
+	ora	(GBASL),Y	; we're odd, or the bottom in		; 5
+big_bottom:
+
+	sta	(GBASL),Y	; plot double height pixel		; 6
+	inc	GBASL		; point to next pixel			; 5
+								;============
+								;	22/18
+
+
+
+	; advance to the next position in space
+
+	; fixed_add(&space_x,&dx,&space_x);
+
+	clc								; 2
+	lda	SPACEX_F						; 3
+dxf_label:
+	adc	#0	; self modifying, is DX_F			; 2
+	sta	SPACEX_F						; 3
+	lda	SPACEX_I						; 3
+dxi_label:
+	adc	#0	; self modifying, is DX_I			; 2
+	sta	SPACEX_I						; 3
+								;==========
+								;	 18
+
+	; fixed_add(&space_y,&dy,&space_y);
+
+	clc								; 2
+	lda	SPACEY_F						; 3
+dyf_label:
+	adc	#0	; self modifyig, is DY_F			; 2
+	sta	SPACEY_F						; 3
+	lda	SPACEY_I						; 3
+dyi_label:
+	adc	#0	; self mofidying is DY_I			; 2
+	sta	SPACEY_I						; 3
+								;============
+								;	 18
+
+	dex	; decrement	SCREEN_X				; 2
+	beq	done_screenx_loop	; branch until we've done 40	; 2nt/3
+								;=============
+								;	4/5
+
+
+	; cache color and return if same as last time
+	lda	SPACEY_I						; 3
+spacey_label:
+	cmp	#0	; self modify, LAST_SPACEY_I			; 2
+	bne	nomatch							; 2nt/3
+	lda	SPACEX_I						; 3
+spacex_label:
+	cmp	#0	; self modify, LAST_SPACEX_I			; 2
+	bne	nomatch							; 2nt/3
+map_color_label:
+	lda	#0	; self modify, LAST_MAP_COLOR			; 2
+	jmp	match							; 3
+
+done_screenx_loop:
+	inc	SCREEN_Y						; 5
+	lda	SCREEN_Y						; 3
+	cmp	#40			; LOWRES height			; 2
+	beq	done_screeny						; 2nt/3
+	jmp	screeny_loop		; too far to branch		; 3
+								;=============
+								;	 15
+done_screeny:
+	rts								; 6
+
+
+	;====================
+	; lookup_map
+	;====================
+	; finds value in space_x.i,space_y.i
+	; returns color in A
+	; CLOBBERS: A,Y
+	; this is used to check if above water or grass
+	; the high-performance per-pixel version has been inlined
+lookup_map:
+
+.if .def(ISLAND_MAP)
+	.include "island_lookup.s"
+.elseif .def(CHECKERBOARD_MAP)
+	.include "checkerboard_lookup.s"
+.elseif .def(RAINBOW_MAP)
+	.include "rainbow_lookup.s"
+.endif
+
+	rts								; 6
+
+
+;===============================================
+; External modules
+;===============================================
+
+.include "../asm_routines/gr_putsprite.s"
+.include "../asm_routines/bg_scroll.s"
+
+.include "sprites.inc"
+
+;===============================================
+; Tables
+;===============================================
+
+.include "island_map.inc"
+.include "starry_sky.scroll"
+
+.include "../asm_routines/multiply_fast.s"
+
+
+; 8.8 fixed point
+; should we store as two arrays, one I one F?
+fixed_sin:
+	.byte $00,$00 ;  0.000000=00.00
+	.byte $00,$61 ;  0.382683=00.61
+	.byte $00,$b5 ;  0.707107=00.b5
+	.byte $00,$ec ;  0.923880=00.ec
+	.byte $01,$00 ;  1.000000=01.00
+	.byte $00,$ec ;  0.923880=00.ec
+	.byte $00,$b5 ;  0.707107=00.b5
+	.byte $00,$61 ;  0.382683=00.61
+	.byte $00,$00 ;  0.000000=00.00
+	.byte $ff,$9f ; -0.382683=ff.9f
+	.byte $ff,$4b ; -0.707107=ff.4b
+	.byte $ff,$14 ; -0.923880=ff.14
+	.byte $ff,$00 ; -1.000000=ff.00
+	.byte $ff,$14 ; -0.923880=ff.14
+	.byte $ff,$4b ; -0.707107=ff.4b
+	.byte $ff,$9f ; -0.382683=ff.9f
+
+fixed_sin_scale:
+	.byte $00,$00
+	.byte $00,$0c
+	.byte $00,$16
+	.byte $00,$1d
+	.byte $00,$20
+	.byte $00,$1d
+	.byte $00,$16
+	.byte $00,$0c
+	.byte $00,$00
+	.byte $ff,$f4
+	.byte $ff,$ea
+	.byte $ff,$e3
+	.byte $ff,$e0
+	.byte $ff,$e3
+	.byte $ff,$ea
+	.byte $ff,$f4
+
+	; we can guarantee 4 cycle indexed reads if we page-aligned this
+;.align 256
+horizontal_lookup:
+	.byte $0C,$0B,$0A,$09,$09,$08,$08,$07,$07,$06,$06,$06,$05,$05,$05,$05
+	.byte $04,$04,$04,$04,$04,$04,$04,$03,$03,$03,$03,$03,$03,$03,$03,$03
+	.byte $26,$22,$20,$1D,$1B,$19,$18,$16,$15,$14,$13,$12,$11,$10,$10,$0F
+	.byte $0E,$0E,$0D,$0D,$0C,$0C,$0C,$0B,$0B,$0A,$0A,$0A,$0A,$09,$09,$09
+	.byte $40,$3A,$35,$31,$2D,$2A,$28,$25,$23,$21,$20,$1E,$1D,$1B,$1A,$19
+	.byte $18,$17,$16,$16,$15,$14,$14,$13,$12,$12,$11,$11,$10,$10,$10,$0F
+	.byte $59,$51,$4A,$44,$40,$3B,$38,$34,$31,$2F,$2C,$2A,$28,$26,$25,$23
+	.byte $22,$21,$20,$1E,$1D,$1C,$1C,$1B,$1A,$19,$18,$18,$17,$16,$16,$15
+	.byte $73,$68,$60,$58,$52,$4C,$48,$43,$40,$3C,$39,$36,$34,$32,$30,$2E
+	.byte $2C,$2A,$29,$27,$26,$25,$24,$22,$21,$20,$20,$1F,$1E,$1D,$1C,$1C
+	.byte $8C,$80,$75,$6C,$64,$5D,$58,$52,$4E,$4A,$46,$43,$40,$3D,$3A,$38
+	.byte $36,$34,$32,$30,$2E,$2D,$2C,$2A,$29,$28,$27,$26,$25,$24,$23,$22
+	.byte $A6,$97,$8A,$80,$76,$6E,$68,$61,$5C,$57,$53,$4F,$4B,$48,$45,$42
+	.byte $40,$3D,$3B,$39,$37,$35,$34,$32,$30,$2F,$2E,$2C,$2B,$2A,$29,$28
+
+
+
diff --git a/mode7_demo/mode7_demo.dsk b/mode7_demo/mode7_demo.dsk
index 96744bd4..766c66b5 100644
Binary files a/mode7_demo/mode7_demo.dsk and b/mode7_demo/mode7_demo.dsk differ
diff --git a/mode7_demo/mode7_demo.s b/mode7_demo/mode7_demo.s
index 34125426..2c1912cf 100644
--- a/mode7_demo/mode7_demo.s
+++ b/mode7_demo/mode7_demo.s
@@ -5,12 +5,72 @@
 	;================================
 
 	jsr     set_gr_page0
-	bit	FULLGR
-	jsr	clear_screens_notext	 ; clear top/bottom of page 0/1
 
 	lda	#$4
 	sta	DRAW_PAGE
 
+	; Initialize the 2kB of multiply lookup tables
+	jsr	init_multiply_tables
+
+	;================================
+	; Main Loop
+	;================================
+
+main_loop:
+	jsr	title_routine
+
+	jsr	checkerboard_demo
+	jsr	island_demo
+	jsr	star_demo
+
+	jmp	main_loop
+
+
+	;===========================
+	; Checkerboard Demo
+	;===========================
+checkerboard_demo:
+	; initialize
+	lda	#>sky_background
+	sta	INH
+	lda	#<sky_background
+	sta	INL
+	jsr	decompress_scroll
+
+	jsr	mode7_flying
+
+	rts
+
+
+	;===========================
+	; Island Demo
+	;===========================
+island_demo:
+	; initialize
+
+	jsr	mode7_flying
+
+	rts
+
+
+	;===========================
+	; Star Demo
+	;===========================
+star_demo:
+	; initialize
+
+
+	rts
+
+
+	;===========================
+	; Title routine
+	;===========================
+
+title_routine:
+	bit	FULLGR
+	jsr	clear_screens_notext	 ; clear top/bottom of page 0/1
+
 	lda	#<demo_rle
 	sta	GBASL
 	lda	#>demo_rle
@@ -24,8 +84,6 @@
 
 	jsr	load_rle_gr
 
-demo_loop:
-
 	;==========
 	; Fade in
 	;==========
@@ -68,8 +126,7 @@ demo_loop:
 	;=============
 	jsr	fade_out
 
-
-	jmp	demo_loop
+	rts
 
 
 ;===============================================
@@ -84,6 +141,8 @@ demo_loop:
 .include "../asm_routines/gr_copy.s"
 .include "../asm_routines/gr_scroll.s"
 
+.include "mode7.s"
+
 .include "mode7_demo_backgrounds.inc"
 
 
diff --git a/mode7_demo/sprites.inc b/mode7_demo/sprites.inc
new file mode 100644
index 00000000..c9262033
--- /dev/null
+++ b/mode7_demo/sprites.inc
@@ -0,0 +1,59 @@
+;================
+; Ship Sprites
+;================
+
+splash_forward:
+	.byte $7,$2
+	.byte $00,$ee,$00,$00,$00,$ee,$00
+	.byte $ee,$00,$00,$00,$00,$00,$ee
+
+splash_right:
+	.byte $7,$2
+	.byte $00,$00,$00,$00,$00,$ee,$00
+	.byte $00,$00,$00,$00,$00,$00,$ee
+
+
+splash_left:
+	.byte $7,$2
+	.byte $00,$ee,$00,$00,$00,$00,$00
+	.byte $ee,$00,$00,$00,$00,$00,$00
+
+shadow_forward:
+	.byte $3,$2
+	.byte $00,$aa,$00
+	.byte $a0,$aa,$a0
+
+shadow_right:
+	.byte $3,$2
+	.byte $a0,$00,$aa
+	.byte $00,$0a,$a0
+
+shadow_left:
+	.byte $3,$2
+	.byte $aa,$00,$a0
+	.byte $a0,$0a,$00
+
+ship_forward:
+	.byte $9,$5
+	.byte $00,$00,$00,$00,$ff,$00,$00,$00,$00
+	.byte $00,$00,$00,$66,$ff,$66,$00,$00,$00
+	.byte $00,$00,$70,$2f,$12,$2f,$70,$00,$00
+	.byte $f0,$f7,$f7,$f2,$d9,$f2,$f7,$f7,$f0
+	.byte $00,$00,$00,$00,$0d,$00,$00,$00,$00
+
+ship_right:
+	.byte $9,$5
+	.byte $00,$00,$00,$00,$00,$60,$60,$f0,$00
+	.byte $00,$f0,$70,$70,$f6,$f6,$6f,$66,$00
+	.byte $00,$07,$ff,$2f,$12,$27,$f6,$00,$00
+	.byte $00,$00,$00,$dd,$d9,$f2,$77,$00,$00
+	.byte $00,$00,$00,$00,$00,$0f,$ff,$70,$00
+
+ship_left:
+	.byte $9,$5
+	.byte $00,$f0,$60,$60,$00,$00,$00,$00,$00
+	.byte $00,$66,$6f,$f6,$f6,$70,$70,$f0,$00
+	.byte $00,$00,$f6,$27,$12,$2f,$ff,$07,$00
+	.byte $00,$00,$77,$f2,$d9,$dd,$00,$00,$00
+	.byte $00,$70,$ff,$0f,$00,$00,$00,$00,$00
+
diff --git a/mode7_demo/starry_sky.scroll b/mode7_demo/starry_sky.scroll
new file mode 100644
index 00000000..60d7fbab
--- /dev/null
+++ b/mode7_demo/starry_sky.scroll
@@ -0,0 +1,10 @@
+; Original size = 1020 bytes
+sky_background:
+; scroll_length:
+.byte 255
+	.byte $A9,$00,$D0,$A9,$00,$50,$F5,$50,$AB,$00,$0F,$A7,$00,$0D,$DD,$D0,$A7,$00,$F0,$A5,$00,$11,$A7,$00,$A4,$70,$D0,$D0,$A7,$00,$70,$A9,$00,$05,$A0,$11,$00,$0F,$A0,$11,$00,$D0,$A0,$12,$00,$50,$A0,$2F,$00,$D0,$A9,$00,$50,$F5,$50,$AB,$00,$0F,$A0,$28,$00
+	.byte $A5,$00,$0F,$A6,$00,$F0,$A4,$00,$0F,$00,$00,$05,$A9,$00,$0F,$A4,$00,$05,$A7,$00,$DD,$A7,$00,$0F,$00,$F0,$00,$F0,$A8,$00,$07,$70,$A4,$75,$FF,$FF,$F0,$A0,$11,$00,$F0,$A5,$00,$05,$A5,$00,$07,$A0,$11,$00,$50,$A0,$1D,$00,$0F,$A0,$18,$00,$05,$AB,$00,$0F,$A6,$00,$F0,$A4,$00,$0F,$00,$00,$05,$A9,$00,$0F,$A4,$00,$05,$A0,$26,$00
+	.byte $00,$00,$F0,$AA,$00,$F0,$00,$00,$F0,$A7,$00,$07,$A4,$00,$70,$AB,$00,$D0,$DD,$0D,$A5,$00,$D0,$A5,$00,$0F,$A8,$00,$07,$70,$05,$75,$75,$D5,$DF,$0F,$A5,$00,$F0,$A5,$00,$50,$A0,$19,$00,$50,$A4,$00,$0D,$AE,$00,$0F,$A5,$00,$07,$A8,$00,$D0,$AB,$00,$07,$AB,$00,$0F,$AF,$00,$F0,$AA,$00,$F0,$00,$00,$F0,$A7,$00,$07,$A4,$00,$70,$A0,$2C,$00
+	.byte $A0,$40,$00,$07,$A0,$BF,$00
+	.byte $A1
+; Compressed size = 231 bytes
diff --git a/mode7_demo/zp.inc b/mode7_demo/zp.inc
index 095b624c..d82038e4 100644
--- a/mode7_demo/zp.inc
+++ b/mode7_demo/zp.inc
@@ -95,6 +95,8 @@ LAST_SPACEY_I	EQU	$88
 LAST_MAP_COLOR	EQU	$89
 DRAW_SKY	EQU	$8A
 COLOR_MASK	EQU	$8B
+KEY_COUNT	EQU	$8C
+KEY_OFFSET	EQU	$8D
 
 SHIPY           EQU     $E4