diff --git a/test4/Makefile b/test4/Makefile
index d81691a..5c926db 100644
--- a/test4/Makefile
+++ b/test4/Makefile
@@ -1,6 +1,6 @@
 build:
 	go build
-	./test2
+	./test4
 
 run:
 	go run *.go
diff --git a/test4/main.go b/test4/main.go
index 3e17723..106d5ef 100644
--- a/test4/main.go
+++ b/test4/main.go
@@ -5,22 +5,18 @@ import "time"
 
 import "git.wit.com/wit/gui"
 
-var guiDS *gui.GuiDS
-
 func main() {
-	guiDS = gui.GetDataStructures()
+	gui.Data.ButtonClick = buttonClick
 
-	guiDS.ButtonClick = buttonClick
-
-	gui.GoMainWindow()
-	// go gui.GoMainWindow()
+	go gui.GoMainWindow()
 
 	watchGUI()
 }
 
 func buttonClick(i int, s string) {
-	log.Println("test2 buttonClick() i, s =", i, s)
+	log.Println("test4 buttonClick() i, s =", i, s)
 	gui.ShowAccountTab()
+	gui.Data.State = "account1 done"
 }
 
 func watchGUI() {
@@ -28,22 +24,22 @@ func watchGUI() {
 	time.Sleep(2000 * time.Millisecond)
 
 	for {
-		log.Println("Sleep()")
+		log.Println("Sleep()", gui.Data.State)
 		time.Sleep(200 * time.Millisecond)
 
-		if (guiDS.State == "splash") {
+		if (gui.Data.State == "splash") {
 			log.Println("Display the splash box")
-			guiDS.State = "done"
+			gui.Data.State = "done"
 		}
-		if (guiDS.State == "kill") {
+		if (gui.Data.State == "kill") {
 			log.Println("gui.State = kill")
 			log.Println("gui.State = kill")
 			log.Println("gui.State = kill")
-			guiDS.State = "account1"
+			gui.Data.State = "account1"
 		}
-		if (guiDS.State == "account1") {
+		if (gui.Data.State == "account1") {
 			log.Println("Display the splash box")
-			guiDS.State = "done"
+			gui.Data.State = "done"
 		}
 	}
 }