diff --git a/Makefile b/Makefile
index 55628c7..033531f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@ ADDRDEMO=6000
 PGM=gui
 DEMO=guidemo
 
-#all: $(DEMO) $(PGM)
-all: $(PGM)
+all: $(DEMO) $(PGM)
+#all: $(PGM)
 
 $(DEMO):
 	@PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh --start-addr $(ADDRDEMO) -l$(DEMO).lst $(DEMO).s
@@ -31,7 +31,7 @@ $(PGM):
 	@PATH=$(PATH):/usr/local/bin; $(CL65) -t apple2enh --start-addr $(ADDR) -l$(PGM).lst $(PGM).s
 	java -jar $(AC) -d $(DEMO).dsk $(PGM)
 	java -jar $(AC) -p $(DEMO).dsk $(PGM) BIN 0x$(ADDR) < $(PGM)
-#	rm -f $(PGM)
+	rm -f $(PGM)
 	rm -f $(PGM).o
 	osascript V2Make.scpt $(PROJECT_DIR) $(DEMO) $(PGM)
 
diff --git a/ReadMe.md b/ReadMe.md
index 1f2d1cf..c78b798 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -5,6 +5,7 @@ Known issues
 - Negative cursor positions unsupported
 - Positive scroll values unsupported
 - Hitting Reset in app that uses windows and desktop (no mouse needed) seems to mess up screen holes for Disk II
+- Mashing a button with mouse in Applesoft will cause Undefined Statement error
 
 
 To Do:
diff --git a/applesoft.s b/applesoft.s
index 558d064..7c67648 100644
--- a/applesoft.s
+++ b/applesoft.s
@@ -595,17 +595,14 @@ WGAmpersand_CURSR:
 	jsr WGAmpersandBeginArguments
 
 	jsr WGAmpersandIntArgument
-	pha
+	sta PARAM0
 	jsr WGAmpersandNextArgument
 
 	jsr WGAmpersandIntArgument
-	pha
+	sta PARAM1
 
 	jsr WGAmpersandEndArguments
 
-	ply
-	plx
-
 	jsr WGSetCursor
 
 	rts
@@ -721,7 +718,8 @@ WGAmpersand_ERASE:
 ; Sets text mode to normal
 ; &NRML
 WGAmpersand_NRML:
-	jsr WGNormal
+	lda #CHAR_NORMAL
+	sta INVERSE
 	rts
 
 
@@ -730,7 +728,8 @@ WGAmpersand_NRML:
 ; Sets text mode to inverse
 ; &INVR
 WGAmpersand_INVR:
-	jsr WGInverse
+	lda #CHAR_INVERSE
+	sta INVERSE
 	rts
 
 
@@ -762,7 +761,7 @@ WGAmpersand_FILL:
 	pha
 
 	jsr WGAmpersandEndArguments
-	plx
+	ply
 
 	jsr WGFillRect
 	jsr WGBottomCursor
diff --git a/gui.s b/gui.s
index e13ac8c..279bc03 100644
--- a/gui.s
+++ b/gui.s
@@ -9,19 +9,40 @@
 
 .org $4000
 
-
 ; Common definitions
 
 .include "zeropage.s"
 .include "switches.s"
 .include "macros.s"
 
-; Main
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Main entry point. BRUN will land here.
 main:
 	jsr WGInit
-	jsr WG80
-	rts
+	rts				; Don't add any bytes here!
+
+
+; This is the non-negotiable entry point used by applications Don't move it!
+; $4004
+
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; WGDispatch
+; The dispatcher for calling the assembly-language API from assembly programs
+; X: API call number
+; P0-3,Y: Parameters to call, as needed
+WGDispatch:
+	jmp (WGEntryPointTable,x)
+
+; Entry point jump table
+WGEntryPointTable:
+.addr WGClearScreen
+.addr WGDesktop
+.addr WGPlot
+.addr WGSetCursor
+.addr WGSetGlobalCursor
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -30,6 +51,7 @@ main:
 WGInit:
 	SAVE_AXY
 
+	jsr WG80
 	jsr WGInitApplesoft
 
 	ldy #15			; Clear our block allocators
@@ -59,9 +81,6 @@ WGInit_clearMemLoop:
 WG80:
 	pha
 
-;	lda #3
-;	jsr $fe95
-
 	lda	#$a0
 	jsr	$c300
 	
@@ -74,31 +93,6 @@ WG80:
 	rts
 
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; waitForKey
-; Spinlocks until a key is pressed
-waitForKey:
-	lda	KBDSTRB
-	bpl waitForKey
-	rts
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; read80ColSwitch
-; Returns value of the 80 col switch on //c and //c+ machines
-; OUT A: Switch state (non-zero=80 cols)
-; NOTE: Untested
-read80ColSwitch:
-	lda $c060
-	bpl read80ColSwitch_40
-	lda #$1
-	rts
-
-read80ColSwitch_40:
-	lda #$0
-	rts
-
-
 ; Code modules
 .include "utility.s"
 .include "painting.s"
@@ -111,7 +105,6 @@ read80ColSwitch_40:
 
 
 
-
 ; Suppress some linker warnings - Must be the last thing in the file
 .SEGMENT "ZPSAVE"
 .SEGMENT "EXEHDR"
diff --git a/guidemo.dsk b/guidemo.dsk
index 642239c..9b22f87 100644
Binary files a/guidemo.dsk and b/guidemo.dsk differ
diff --git a/guidemo.s b/guidemo.s
index 72c6f86..8e1248d 100644
--- a/guidemo.s
+++ b/guidemo.s
@@ -10,23 +10,44 @@
 .org $6000
 
 ; Reserved locations
-
-
-; Constants
-
-
-; ROM entry points
+PARAM0			= $06
+PARAM1			= $07
+PARAM2			= $08
+PARAM3			= $09
 
 
 ; WeeGUI entry points
+WeeGUI = $4004
 
-GUI_MAIN = $4000
+WGClearScreen = 0
+WGDesktop = 2
+WGPlot = 4
+WGSetCursor = 6
+WGSetGlobalCursor = 8
 
 
-; Main
-
+; Sample code
 main:
+	ldx #WGClearScreen
+	jsr WeeGUI
 
+	ldx #WGDesktop
+	jsr WeeGUI
+
+	lda #40
+	sta PARAM0
+	lda #12
+	sta PARAM1
+	ldx #WGSetGlobalCursor
+	jsr WeeGUI
+
+	lda #'Q'+$80
+	ldx #WGPlot
+	jsr WeeGUI
+
+	rts
+
+.if 0
 	;jmp	tortureTestPrint
 	;jmp	tortureTestRects
 
@@ -144,8 +165,10 @@ testPaintContents:
 
 ;;
 	jsr WGNormal
-	ldx #10
-	ldy #15
+	lda #10
+	sta PARAM0
+	lda #15
+	sta PARAM1
 	jsr WGSetCursor
 	CALL16 WGPrint,testStr
 
@@ -156,6 +179,8 @@ testPaintContents:
 	ldy #0
 testPaintContents_loop:
 	ldx #0
+	stx PARAM0
+	sty PARAM1
 	jsr WGSetCursor
 
 	tya
@@ -217,7 +242,7 @@ testTitle2:
 testTitle3:
 	.byte "More Magic",0
 
-
+.endif
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 
diff --git a/macros.s b/macros.s
index b187ed3..a3f5d3f 100644
--- a/macros.s
+++ b/macros.s
@@ -118,22 +118,6 @@
 .endmacro
 
 
-.macro PARAMQUAD p0,p1,p2,p3
-	lda #p0
-	sta PARAM0
-	lda #p1
-	sta PARAM1
-	lda #p2
-	sta PARAM2
-	lda #p3
-	sta PARAM3
-.endmacro
-
-.macro CALLQUAD func,p0,p1,p2,p3
-	PARAMQUAD p0,p1,p2,p3
-	jsr func
-.endmacro
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Rendering macros
 ;
diff --git a/painting.s b/painting.s
index 36077dd..00f749e 100644
--- a/painting.s
+++ b/painting.s
@@ -82,13 +82,13 @@ WGDesktop_charLoop:
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; WGPlot
-; Plots a character at current cursor position (assumes 80 cols)
+; Plots a character at global cursor position (assumes 80 cols)
 ; A: Character to plot (Apple format)
 ; Side effects: Clobbers S0, BASL,BASH
 ;
 WGPlot:
 	sta SCRATCH0
-	SAVE_AXY
+	SAVE_XY
 
 	ldx	WG_CURSORY
 	lda TEXTLINES_L,x	; Compute video memory address of point
@@ -110,19 +110,17 @@ WGPlot:
 	bne	WGPlot_xOdd
 
 	SETSWITCH	PAGE2ON		; Plot the character
-	ldy	#$0
 	lda	SCRATCH0
-	sta	(BASL),y
+	sta	(BASL)
 	jmp WGPlot_done
 
 WGPlot_xOdd:
 	SETSWITCH	PAGE2OFF	; Plot the character
-	ldy	#$0
 	lda	SCRATCH0
-	sta	(BASL),y
+	sta	(BASL)
 
 WGPlot_done:
-	RESTORE_AXY
+	RESTORE_XY
 	rts
 
 
@@ -146,16 +144,8 @@ WGPrint:
 	sta	SCRATCH1
 
 	LDX_ACTIVEVIEW			; Cache view width for later
-	inx
-	inx
-	inx
-	inx
-	inx
-	inx
-	inx
-	lda WG_VIEWRECORDS,x
+	lda WG_VIEWRECORDS+7,x
 	sta WG_SCRATCHA
-	inx						; Leave X pointing at view height, for later quick access
 
 	ldy #0
 
@@ -168,10 +158,10 @@ WGPrint_lineLoopFirst:		; Calculating start of first line is slightly different
 	cmp WG_VIEWCLIP+0
 	bcs WGPrint_visibleChars
 
-	lda	WG_VIEWCLIP+0
-	sec						; Line begins before left clip plane
+	lda	WG_VIEWCLIP+0		; Line begins before left clip plane
+	sec						; Advance string index and advance cursor into clip box
 	sbc WG_LOCALCURSORX
-	tay						; Advance string index and advance cursor into clip box
+	tay
 	lda WG_VIEWCLIP+0
 	sta	WG_LOCALCURSORX
 	bra WGPrint_visibleChars
@@ -244,7 +234,7 @@ WGPrint_charLoopNormal:
 	beq	WGPrint_endVisible
 	bra WGPrint_charLoopNormal
 
-WGPrint_done:				; This is up here to keep local branches in range
+WGPrint_done:				; This is in the middle here to keep local branches in range
 	RESTORE_ZPS
 	RESTORE_AXY
 	rts
@@ -262,14 +252,14 @@ WGPrint_nextLine:
 	lda	WG_LOCALCURSORY
 	cmp	WG_VIEWCLIP+3			; Check for bottom clip plane
 	beq	WGPrint_done
-	cmp	WG_VIEWRECORDS,x		; Check for bottom of view
+	cmp	WG_VIEWRECORDS+8,x		; Check for bottom of view
 	beq	WGPrint_done
 	lda	(PARAM0),y				; Check for end string landing exactly at line end
 	beq	WGPrint_done
 	
 	lda #0						; Wrap to next line
 	sta	WG_LOCALCURSORX
-	jmp WGPrint_lineLoop
+	bra WGPrint_lineLoop
 
 WGPrint_charLoopInverse:
 	lda	(PARAM0),y			; Draw current character
@@ -282,7 +272,7 @@ WGPrint_charLoopInverse:
 WGPrint_charLoopInverseLow:
 	and #%00111111			; Normal inverse
 
-WGPrint_charLoopInversePlot:	; This is down here to keep local branches in range
+WGPrint_charLoopInversePlot:
 	jsr	WGPlot
 	iny
 
@@ -296,28 +286,3 @@ WGPrint_charLoopInversePlot:	; This is down here to keep local branches in range
 	beq	WGPrint_endVisible
 	bra WGPrint_charLoopInverse
 
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; WGNormal
-; Sets normal text rendering mode
-;
-WGNormal:
-	pha
-	lda #CHAR_NORMAL
-	sta INVERSE
-	pla
-	rts
-
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; WGInverse
-; Sets inverse text rendering mode
-;
-WGInverse:
-	pha
-	lda #CHAR_INVERSE
-	sta INVERSE
-	pla
-	rts
-
diff --git a/rects.s b/rects.s
index 4298b39..5f11d2d 100644
--- a/rects.s
+++ b/rects.s
@@ -14,14 +14,12 @@
 ; PARAM1: Top edge
 ; PARAM2: Width
 ; PARAM3: Height
-; X: Character to fill (Apple format)
-; Side effects: Clobbers BASL,BASH
+; Y: Character to fill (Apple format)
+; Side effects: Clobbers Y,S0,BASL,BASH
 ;
 WGFillRect:
-
-	SAVE_AXY
-	SAVE_ZPS
-	stx	SCRATCH0
+	SAVE_AX
+	sty	SCRATCH0
 
 	clc					; Compute bottom edge
 	lda	PARAM1
@@ -58,9 +56,9 @@ WGFillRect_vertLoop:
 	dey
 	phy					; We'll reuse this calculation for the odd columns
 
+	lda	SCRATCH0					; Prepare to plot
 WGFillRect_horzLoopEvenAligned0:	; Draw even columns
-	lda	SCRATCH0					; Plot the character
-	sta	(BASL),y
+	sta	(BASL),y					; Plot the character
 	dey
 	bpl	WGFillRect_horzLoopEvenAligned0	; Loop for w/2
 
@@ -68,8 +66,7 @@ WGFillRect_horzLoopEvenAligned0:	; Draw even columns
 	ply								; Iterate w/2 again
 
 WGFillRect_horzLoopEvenAligned1:	; Draw odd columns
-	lda	SCRATCH0					; Plot the character
-	sta	(BASL),y
+	sta	(BASL),y					; Plot the character
 	dey
 	bpl	WGFillRect_horzLoopEvenAligned1	; Loop for w/2
 
@@ -89,7 +86,7 @@ WGFillRect_horzLoopEvenAlignedEvenWidth:
 	dex
 	cpx	PARAM1
 	bcs	WGFillRect_vertLoop
-	jmp	WGFillRect_done
+	bra	WGFillRect_done
 
 WGFillRect_horzLoopOdd:
 	; CASE 2: Left edge odd-aligned, even width
@@ -99,9 +96,9 @@ WGFillRect_horzLoopOdd:
 	tay					; Iterate w/2
 	phy					; We'll reuse this calculation for the even columns
 
+	lda	SCRATCH0					; Prepare to plot
 WGFillRect_horzLoopOddAligned0:		; Draw even columns
-	lda	SCRATCH0					; Plot the character
-	sta	(BASL),y
+	sta	(BASL),y					; Plot the character
 	dey
 	bne	WGFillRect_horzLoopOddAligned0	; Loop for w/2
 
@@ -110,8 +107,7 @@ WGFillRect_horzLoopOddAligned0:		; Draw even columns
 	dey
 
 WGFillRect_horzLoopOddAligned1:		; Draw even columns
-	lda	SCRATCH0					; Plot the character
-	sta	(BASL),y
+	sta	(BASL),y					; Plot the character
 	dey
 	bpl	WGFillRect_horzLoopOddAligned1	; Loop for w/2
 
@@ -130,14 +126,10 @@ WGFillRect_horzLoopOddAlignedEvenWidth:
 	plx								; Prepare for next row
 	dex
 	cpx	PARAM1
-	bcs	WGFillRect_vertLoopJmp
-	jmp WGFillRect_done
-WGFillRect_vertLoopJmp:
-	jmp	WGFillRect_vertLoop
+	bcs WGFillRect_vertLoop
 
 WGFillRect_done:
-	RESTORE_ZPS
-	RESTORE_AXY
+	RESTORE_AX
 	rts
 
 
@@ -178,7 +170,6 @@ CH_DOUBLE = '\'
 
 
 WGStrokeRect:
-
 	SAVE_AXY
 	SAVE_ZPS
 
diff --git a/unit_test.s b/unit_test.s
index 4bc998b..d070dc6 100644
--- a/unit_test.s
+++ b/unit_test.s
@@ -44,8 +44,9 @@ tortureTestPrint_init:
 
 tortureTestPrint_loop:
 	phx
-	ldx	#0			; Initialize
-	ldy	#0
+	lda	#0			; Initialize
+	sta PARAM0
+	sta PARAM1
 	jsr	WGSetCursor
 	plx
 
@@ -187,7 +188,7 @@ tortureTestRectsEvenLoop:
 	dec
 	sta	$0100,x
 
-	ldx	#'Q'+$80
+	ldy	#'Q'+$80
 	jsr	WGFillRect
 	jsr	WGStrokeRect
 
@@ -252,7 +253,7 @@ tortureTestRectsOddLoop:
 	dec
 	sta	$0100,x
 
-	ldx	#'Q'+$80
+	ldy	#'Q'+$80
 	jsr	WGFillRect
 	jsr	WGStrokeRect
 
diff --git a/views.s b/views.s
index 94a4a4d..0b9ea7e 100644
--- a/views.s
+++ b/views.s
@@ -383,7 +383,8 @@ paintCheck_plot:				; Paint our state
 
 	inc WG_CURSORX				; Prepare for title
 	inc WG_CURSORX
-	jsr WGNormal
+	lda #CHAR_NORMAL
+	sta INVERSE
 
 	lda WG_VIEWRECORDS+12,y
 	sta PARAM0
@@ -436,12 +437,14 @@ paintButton:
 	lda WG_VIEWRECORDS+9,y	; Is button highlighted?
 	and #$80
 	bne paintButton_titleSelected
-	jsr WGNormal
+	lda #CHAR_NORMAL
+	sta INVERSE
 	lda #' '+$80
 	bra paintButton_titleMarginLeft
 
 paintButton_titleSelected:
-	jsr WGInverse
+	lda #CHAR_INVERSE
+	sta INVERSE
 	lda #' '
 
 paintButton_titleMarginLeft:
@@ -553,7 +556,7 @@ WGEraseView:
 	inc
 	sta PARAM3
 
-	ldx	#' '+$80
+	ldy	#' '+$80
 	jsr WGFillRect
 
 WGEraseView_done:
@@ -585,7 +588,7 @@ WGEraseViewContents:
 	lda	WG_VIEWRECORDS,y
 	sta PARAM3
 
-	ldx	#' '+$80
+	ldy	#' '+$80
 	jsr WGFillRect
 
 WGEraseViewContents_done:
@@ -950,15 +953,40 @@ WGViewSetAction_done:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; WGSetCursor
 ; Sets the current local view cursor
-; X: X
-; Y: Y
+; PARAM0: X
+; PARAM1: Y
 ;
 WGSetCursor:
-	stx	WG_LOCALCURSORX
-	sty	WG_LOCALCURSORY
+	pha
+
+	lda PARAM0
+	sta	WG_LOCALCURSORX
+	lda PARAM1
+	sta	WG_LOCALCURSORY
+
+	pla
 	rts
 	
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; WGSetGlobalCursor
+; Sets the current global cursor
+; PARAM0: X
+; PARAM1: Y
+;
+WGSetGlobalCursor:
+	pha
+
+	lda PARAM0
+	sta	WG_CURSORX
+	lda PARAM1
+	sta	WG_CURSORY
+
+	pla
+	rts
+	
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; WGSyncGlobalCursor
 ; Synchronizes the global cursor with the current local view's
diff --git a/zeropage.s b/zeropage.s
index 57b6f83..34e352b 100644
--- a/zeropage.s
+++ b/zeropage.s
@@ -21,4 +21,4 @@ PARAM1			= $07
 PARAM2			= $08
 PARAM3			= $09
 SCRATCH0		= $19
-SCRATCH1		= $1A
+SCRATCH1		= $1a