diff --git a/demosplash/Makefile b/demosplash/Makefile
index c8e917e8..425e9024 100644
--- a/demosplash/Makefile
+++ b/demosplash/Makefile
@@ -53,7 +53,11 @@ demosplash.o:	demosplash.s \
 	pt3_lib_init.s pt3_lib_core.s pt3_lib_mockingboard.s \
 	pt3_lib_play_frame.s pt3_lib_write_frame.s \
 	interrupt_handler.s \
+	starbase.s \
+	starbase_action.s \
 	missing.s k_40_48d.inc create_update_type1.s \
+	graphics/starbase/starbase.inc \
+	graphics/sprites/alien.inc graphics/sprites/astronaut.inc \
 	escape.s create_update_type2.s offsets_table2.s \
 	book.s book_40_48d.inc \
 	credits.s credits_bg.inc offsets_table.s \
diff --git a/demosplash/demosplash.s b/demosplash/demosplash.s
index 7fcd2860..613cf116 100644
--- a/demosplash/demosplash.s
+++ b/demosplash/demosplash.s
@@ -127,13 +127,16 @@ frame_decode_loop:
 	; starbase scene
 	;===========================
 
-;	jsr	starbase
+	jsr	starbase
 
 	;===========================
 	; escape scene
 	;===========================
 
-	jsr	escape
+	nop
+	nop
+	nop
+;	jsr	escape
 
 	;===========================
 	; book scene
@@ -170,7 +173,6 @@ wait_until_keypressed:
 
 ; Apple II intro
 .include "appleII_intro.s"
-.include "appleII_40_96.inc"
 
 .align $100
 .include "vapor_lock.s"
@@ -197,7 +199,7 @@ wait_until_keypressed:
 .include "starbase.s"
 
 ; escape
-.include "escape.s"
+;.include "escape.s"
 
 ; book
 .include "book.s"
@@ -217,6 +219,7 @@ wait_until_keypressed:
 .include "create_update_type2.s"
 
 ; Pictures (no need to align)
+.include "appleII_40_96.inc"
 .include "earth.inc"
 .include "book_40_48d.inc"
 .include "credits_bg.inc"
diff --git a/demosplash/graphics/sprites/astronaut.inc b/demosplash/graphics/sprites/astronaut.inc
index 66be47b5..153d3d39 100644
--- a/demosplash/graphics/sprites/astronaut.inc
+++ b/demosplash/graphics/sprites/astronaut.inc
@@ -12,8 +12,8 @@
 astro_stand:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -44,8 +44,8 @@ astro_walk_progression:
 astro_walk_left1:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ab,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -55,8 +55,8 @@ astro_walk_left1:
 astro_walk_left2:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -66,8 +66,8 @@ astro_walk_left2:
 astro_walk_left3:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -77,8 +77,8 @@ astro_walk_left3:
 astro_walk_left4:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -88,8 +88,8 @@ astro_walk_left4:
 astro_walk_left5:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$bb,$22,$aa,$aa
 	.byte $fa,$aa,$22,$aa,$aa
@@ -99,8 +99,8 @@ astro_walk_left5:
 astro_walk_left6:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$6a,$22,$aa,$aa
@@ -110,8 +110,8 @@ astro_walk_left6:
 astro_walk_left7:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$2b,$aa,$aa
 	.byte $aa,$6a,$22,$aa,$aa
@@ -121,8 +121,8 @@ astro_walk_left7:
 astro_walk_left8:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$6a,$22,$aa,$aa
@@ -132,8 +132,8 @@ astro_walk_left8:
 astro_walk_left9:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -143,8 +143,8 @@ astro_walk_left9:
 astro_walk_left10:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -286,8 +286,8 @@ astro_run_left9:
 kick1:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $bb,$ab,$22,$ba,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -303,8 +303,8 @@ kick1:
 shooting1:
 	.byte 5,8
 	.byte $AA,$AA,$8A,$8A,$AA
-	.byte $AA,$AA,$bb,$88,$AA
-	.byte $0A,$0A,$AA,$2B,$AA
+	.byte $AA,$AA,$bb,$88,$8A
+	.byte $0A,$0A,$AA,$2B,$88
 	.byte $AA,$A0,$AB,$B2,$AA
 	.byte $AA,$AA,$AA,$22,$AA
 	.byte $AA,$AA,$AA,$22,$AA
@@ -347,8 +347,8 @@ crouch1:
 	.byte 3,8
 	.byte $aa,$aa,$aa
 	.byte $8a,$8a,$aa
-	.byte $bb,$88,$aa
-	.byte $aa,$2b,$aa
+	.byte $bb,$88,$8a
+	.byte $aa,$2b,$88
 	.byte $aa,$bb,$aa
 	.byte $aa,$bb,$aa
 	.byte $22,$22,$aa
@@ -359,8 +359,8 @@ crouch2:
 	.byte $AA,$aa,$aa,$aa,$AA
 	.byte $AA,$aa,$aa,$aa,$AA
 	.byte $AA,$8a,$8a,$aa,$AA
-	.byte $AA,$bb,$88,$aa,$AA
-	.byte $AA,$aa,$2b,$2a,$AA
+	.byte $AA,$bb,$88,$8a,$AA
+	.byte $AA,$aa,$2b,$28,$AA
 	.byte $AA,$aa,$bb,$22,$AA
 	.byte $AA,$ba,$2b,$aa,$AA
 	.byte $AA,$52,$f2,$f2,$AA
@@ -477,8 +477,8 @@ astro_jump_progression:
 jump1:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$aa,$bb,$aa,$aa
 	.byte $aa,$ba,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -488,7 +488,7 @@ jump1:
 jump2:
 	.byte 5,8
 	.byte $8a,$8a,$aa,$aa,$aa
-	.byte $bb,$88,$aa,$aa,$aa
+	.byte $bb,$88,$8a,$8a,$aa
 	.byte $aa,$2b,$22,$aa,$aa
 	.byte $aa,$22,$bb,$aa,$aa
 	.byte $aa,$a2,$bb,$aa,$aa
@@ -499,7 +499,7 @@ jump2:
 jump3:
 	.byte 5,8
 	.byte $8a,$8a,$aa,$aa,$aa
-	.byte $bb,$88,$aa,$aa,$aa
+	.byte $bb,$88,$8a,$8a,$aa
 	.byte $aa,$2b,$22,$aa,$aa
 	.byte $aa,$22,$bb,$aa,$aa
 	.byte $aa,$a2,$bb,$aa,$aa
@@ -510,7 +510,7 @@ jump3:
 jump4:
 	.byte 5,8
 	.byte $8a,$8a,$aa,$aa,$aa
-	.byte $bb,$88,$aa,$aa,$aa
+	.byte $bb,$88,$8a,$8a,$aa
 	.byte $aa,$2b,$22,$aa,$aa
 	.byte $aa,$22,$bb,$aa,$aa
 	.byte $aa,$a2,$bb,$aa,$aa
@@ -521,7 +521,7 @@ jump4:
 jump5:
 	.byte 5,8
 	.byte $b8,$88,$aa,$aa,$aa
-	.byte $ab,$b8,$aa,$aa,$aa
+	.byte $ab,$b8,$8a,$8a,$aa
 	.byte $ba,$b2,$2b,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
@@ -532,8 +532,8 @@ jump5:
 jump6:
 	.byte 5,8
 	.byte $aa,$b8,$88,$aa,$aa
-	.byte $aa,$ab,$b8,$aa,$aa
-	.byte $ab,$ba,$b2,$aa,$aa
+	.byte $aa,$ab,$b8,$8a,$aa
+	.byte $ab,$ba,$b2,$aa,$a8
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$66,$22,$2a,$fa
@@ -543,8 +543,8 @@ jump6:
 jump7:
 	.byte 5,8
 	.byte $aa,$b8,$88,$aa,$aa
-	.byte $aa,$ab,$b8,$aa,$aa
-	.byte $aa,$aa,$b2,$aa,$aa
+	.byte $aa,$ab,$b8,$8a,$aa
+	.byte $aa,$aa,$b2,$a8,$aa
 	.byte $ab,$ab,$22,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$66,$22,$2a,$fa
@@ -554,8 +554,8 @@ jump7:
 jump8:
 	.byte 5,8
 	.byte $aa,$8a,$8a,$aa,$aa
-	.byte $aa,$bb,$88,$aa,$aa
-	.byte $aa,$aa,$2b,$aa,$aa
+	.byte $aa,$bb,$88,$8a,$aa
+	.byte $aa,$aa,$2b,$88,$aa
 	.byte $aa,$b2,$bb,$aa,$aa
 	.byte $aa,$aa,$22,$aa,$aa
 	.byte $aa,$2a,$22,$aa,$aa
@@ -590,8 +590,8 @@ crouch_shooting:
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$8a,$8a,$aa
-	.byte $AA,$AA,$bb,$88,$aa
-	.byte $0A,$0A,$aa,$2b,$2a
+	.byte $AA,$AA,$bb,$88,$8a
+	.byte $0A,$0A,$aa,$2b,$28
 	.byte $AA,$A0,$ba,$bb,$22
 	.byte $AA,$AA,$2a,$2b,$aa
 	.byte $AA,$AA,$52,$f2,$f2
@@ -607,8 +607,8 @@ crouch_kicking:
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$aa,$aa,$aa
 	.byte $AA,$AA,$8a,$8a,$aa
-	.byte $AA,$AA,$bb,$88,$aa
-	.byte $AA,$AA,$aa,$2b,$2a
+	.byte $AA,$AA,$bb,$88,$8a
+	.byte $AA,$AA,$aa,$2b,$28
 	.byte $AA,$AA,$aa,$bb,$22
 	.byte $AA,$AA,$2a,$bb,$a2
 	.byte $5A,$56,$A2,$f2,$f2
diff --git a/demosplash/graphics/starbase/Makefile b/demosplash/graphics/starbase/Makefile
index 02e4f0f9..3df29e28 100644
--- a/demosplash/graphics/starbase/Makefile
+++ b/demosplash/graphics/starbase/Makefile
@@ -9,7 +9,7 @@ all:	starbase.inc
 
 starbase.inc:	$(PNG2RLE) \
 	jail.png hallway.png window.png ship.png
-	$(PNG2RLE) asm jail.png jail_rle >> starbase.inc
+	$(PNG2RLE) asm jail.png jail_rle > starbase.inc
 	$(PNG2RLE) asm hallway.png hallway_rle >> starbase.inc
 	$(PNG2RLE) asm window.png window_rle >> starbase.inc
 	$(PNG2RLE) asm ship.png ship_rle >> starbase.inc
diff --git a/demosplash/graphics/starbase/jail.png b/demosplash/graphics/starbase/jail.png
index 4c66796a..916c74ab 100644
Binary files a/demosplash/graphics/starbase/jail.png and b/demosplash/graphics/starbase/jail.png differ
diff --git a/demosplash/graphics/starbase/ootw_running-20190309-163912.piskel b/demosplash/graphics/starbase/ootw_running-20190309-163912.piskel
new file mode 100644
index 00000000..ecd5f2f4
--- /dev/null
+++ b/demosplash/graphics/starbase/ootw_running-20190309-163912.piskel
@@ -0,0 +1 @@
+{"modelVersion":2,"piskel":{"name":"ootw_running","description":"","fps":5,"height":48,"width":80,"layers":["{\"name\":\"Layer 1\",\"opacity\":1,\"frameCount\":9,\"chunks\":[{\"layout\":[[0],[1],[2],[3],[4],[5],[6],[7],[8]],\"base64PNG\":\"data:image/png;base64,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\"}]}"],"hiddenFrames":[]}}
\ No newline at end of file
diff --git a/demosplash/graphics/starbase/starbase.inc b/demosplash/graphics/starbase/starbase.inc
index 295fc69d..ccfecd41 100644
--- a/demosplash/graphics/starbase/starbase.inc
+++ b/demosplash/graphics/starbase/starbase.inc
@@ -1,7 +1,35 @@
 jail_rle:	.byte $28 ; ysize=48
-	.byte $A0,$78,$55, $A0,$FF,$00, $A0,$69,$00, $AB,$50, $A0,$1D,$00, $AC,$55, $50
-	.byte $A0,$1B,$00, $AE,$55, $50, $A0,$19,$00, $A0,$10,$55, $50, $A0,$17,$00
-	.byte $A0,$12,$55, $A0,$16,$50, $A0,$FF,$55, $A0,$19,$55
+	.byte $A0,$12,$77, $57,$57, $A0,$14,$55, $AE,$77, $57,$57, $A0,$18,$55, $AA,$77
+	.byte $57,$57, $A7,$55, $00, $A0,$01,$A0, $50, $A0,$01,$A0, $A3,$55
+	.byte $00, $A0,$01,$A0, $50, $A0,$01,$A0, $A3,$55, $00, $A0,$01,$A0
+	.byte $50, $A0,$01,$A0, $A0,$16,$55, $00, $A0,$01,$AA, $55, $A0,$01,$AA
+	.byte $55, $76, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA
+	.byte $55, $76, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA
+	.byte $55, $76, $A5,$55, $95, $99, $AD,$55, $00
+	.byte $A0,$01,$AA, $55, $A0,$01,$AA, $55, $77, $55, $00
+	.byte $A0,$01,$AA, $55, $A0,$01,$AA, $55, $77, $55, $00
+	.byte $A0,$01,$AA, $55, $A0,$01,$AA, $55, $77, $A6,$55, $99
+	.byte $95, $AC,$55, $00, $A0,$01,$AA, $55, $A0,$01,$AA, $55
+	.byte $77, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA, $55
+	.byte $77, $55, $00, $A0,$01,$AA, $55, $A0,$01,$AA, $55
+	.byte $77, $A6,$55, $59, $AD,$55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $A0,$14,$55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $55, $00, $A0,$01,$AA, $55
+	.byte $A0,$01,$AA, $55, $77, $A0,$12,$55, $05,$05, $00, $0A
+	.byte $05, $0A, $05, $07, $05, $00, $0A
+	.byte $05, $0A, $05, $07, $05, $00, $0A
+	.byte $05, $0A, $05, $07, $05, $AF,$55, $45
+	.byte $A0,$18,$44, $AD,$55, $45, $AE,$44, $94, $44, $94
+	.byte $44,$44, $94, $A6,$44, $AB,$55, $45, $A0,$10,$44, $49
+	.byte $94, $99, $44,$44, $99,$99, $A5,$44, $AA,$05, $04
+	.byte $A0,$11,$44, $49, $44, $49, $44,$44, $49, $A6,$44
+	.byte $AB,$77, $70, $04, $A0,$1B,$44, $AD,$77, $70, $04
+	.byte $A0,$19,$44, $AF,$77, $70, $04, $A0,$17,$44, $A0,$11,$77, $70
+	.byte $04, $A0,$15,$44, $A0,$13,$77, $70, $04, $A0,$13,$44, $A0,$15,$77
+	.byte $70, $A0,$12,$04, $A0,$C8,$77
 	.byte $A1
 hallway_rle:	.byte $28 ; ysize=48
 	.byte $A3,$55, $A0,$11,$AA, $AD,$55, $A7,$AA, $55,$55, $A0,$01,$A5, $A0,$11,$AA
diff --git a/demosplash/starbase.s b/demosplash/starbase.s
index 905ef12e..095c7483 100644
--- a/demosplash/starbase.s
+++ b/demosplash/starbase.s
@@ -20,7 +20,7 @@ starbase_new_room:
 	lda	#0
 	sta	GAME_OVER
 
-	jsr	ootw_city
+	jsr	starbase_setup_room
 
 c4_check_done:
 	lda	GAME_OVER
diff --git a/demosplash/starbase_action.s b/demosplash/starbase_action.s
index 61885d14..2f3f8142 100644
--- a/demosplash/starbase_action.s
+++ b/demosplash/starbase_action.s
@@ -4,7 +4,8 @@
 	; starbase_init
 	;=======================
 	;=======================
-	; call once before entering city for first time
+	; call once before entering starbase for first time
+
 starbase_init:
 	lda	#0
 	sta	WHICH_ROOM
@@ -58,22 +59,22 @@ starbase_init:
 	lda	#1
 	sta	HAVE_GUN
 
-	lda	#19
+	lda	#0
 	sta	ASTRONAUT_X
-	lda	#230			; start offscreen
+	lda	#20			; start offscreen
 	sta	ASTRONAUT_Y
 
-	lda	#28
-	sta	fall_down_destination_smc+1
+;	lda	#28
+;	sta	fall_down_destination_smc+1
 
-	lda	#28
-	sta	fall_sideways_destination_smc+1
+;	lda	#28
+;	sta	fall_sideways_destination_smc+1
 
-	lda	#P_FALLING_DOWN		; fall into level
+	lda	#P_STANDING		; fall into level
 	sta	ASTRONAUT_STATE
 
-	lda	#$2c
-	sta	falling_stop_smc
+;	lda	#$2c
+;	sta	falling_stop_smc
 
 	rts
 
@@ -83,7 +84,7 @@ starbase_init:
 	; enter new room in jail
 	;===========================
 	;===========================
-ootw_city:
+starbase_setup_room:
 	;=================================
 	; setup vars