diff --git a/binaries/data/mods/official/gui/test/2_mainmenu.xml b/binaries/data/mods/official/gui/test/2_mainmenu.xml
index caf006d4d4..8529e32211 100644
--- a/binaries/data/mods/official/gui/test/2_mainmenu.xml
+++ b/binaries/data/mods/official/gui/test/2_mainmenu.xml
@@ -354,39 +354,8 @@
 				size="50%-125 200 50%-25 230"
 			>Continue
 				<action on="Press"><![CDATA[
-					gameName = getGUIObjectByName("pregame_mp_host_gamename").caption;
-					guiSwitch ("pregame_mp_host", "pregame_mp_setup_host");
-					guiHide("pregame_mainmenu_versionnumber");
- 
-					// Set up the server
-					server = createServer();
-					// Welcome message
-					server.welcomeMessage = getGUIObjectByName("pregame_mp_host_welcomemsg").caption;
-					// Server Name
-					server.serverName = getGUIObjectByName("pregame_mp_host_gamename").caption;
-                              	
-					// start listening
-					res =  server.open();
-					if (!res)
-					{
-						messageBox(400, 200, "Error creating server.", "Error", 0, new array(), new array());
-					}
-
-					// Set the title for the setup screen
-					getGUIObjectByName("pregame_mp_setup_host_titlebar").caption = "Hosting: " + getGUIObjectByName("pregame_mp_host_gamename").caption;
-
-					// Set the host player's name on the setup screen
-					getGUIObjectByName("pregame_mp_setup_host_p1_txt").caption = "P1: " + getGUIObjectByName("pregame_mp_modesel_playername").caption + " (Host)";
-
-					server.onClientConnect =  function (event) 
-						{
-							console.write("A new client has successfully connected! ID: " + event.id + ", Name: " + event.name + ", Session: " + event.session);
-							var playerSlot = g_GameAttributes.getOpenSlot();
-							// assign a slot
-							playerSlot.assignToSession(event.session);
-							console.write("slot: " + playerSlot.player);
-							// need to refresh the dialog control data here
-						}
+					//initMPSessionHost();
+					console.write("initMPSessionHost() was supposed to be called here.");
 				]]></action>
 			</object>
 
@@ -480,8 +449,12 @@
 					else
 					{
 						// see above
-						console.write ("Client successfully connected.");
+						console.write ("Client successfully started to connect.");
 					}
+					
+					client.onConnectComplete=function (event) {
+						messageBox(400, 200, "Result message: "+event.message, "Connect complete", 2, new Array(), new Array());
+					};
 				]]></action>
 			</object>
 
@@ -631,7 +604,7 @@
 				style="border_box_black"
 				type="input"
 				size="600 32 750 52"
-			>gathertest
+			>gathertest2
 			</object>
 
 			<!--
diff --git a/binaries/data/mods/official/gui/test/9_global.xml b/binaries/data/mods/official/gui/test/9_global.xml
index b4fc461884..0d10b3e3da 100644
--- a/binaries/data/mods/official/gui/test/9_global.xml
+++ b/binaries/data/mods/official/gui/test/9_global.xml
@@ -89,21 +89,21 @@
                                 mbButton1Caption
                                 <action on="Press"><![CDATA[
                                         eval(getGUIGlobal().mbButton1Code);
-                                        GUIObjectHide('mb_main');
+                                        guiHide('mb_main');
                                 ]]></action>
                         </object>
                         <object type="button" name="mb_button2" size="33%+30 100%-80 66%-40 100%-50" absolute="false" sprite="message_box_button_normal" sprite_over="message_box_button_over" font="prospero18" z="165" text_align="center" text_valign="center">
                                 mbButton2Caption
                                 <action on="Press"><![CDATA[
                                         eval(getGUIGlobal().mbButton2Code);
-                                        GUIObjectHide('mb_main');
+                                        guiHide('mb_main');
                                 ]]></action>
                         </object>
                         <object type="button" name="mb_button3" size="66%+30 100%-80 100%-40 100%-50" absolute="false" sprite="message_box_button_normal" sprite_over="message_box_button_over" font="prospero18" z="165" text_align="center" text_valign="center">
                                 mbButton3Caption
                                 <action on="Press"><![CDATA[
                                         eval(getGUIGlobal().mbButton2Code);
-                                        GUIObjectHide('mb_main');
+                                        guiHide('mb_main');
                                 ]]></action>
                         </object>
 
diff --git a/binaries/data/mods/official/gui/test/functions_pregame_mp.js b/binaries/data/mods/official/gui/test/functions_pregame_mp.js
index 09b983801d..61f4a4509e 100644
--- a/binaries/data/mods/official/gui/test/functions_pregame_mp.js
+++ b/binaries/data/mods/official/gui/test/functions_pregame_mp.js
@@ -1,37 +1,63 @@
 // ====================================================================
 
-function initMPSessionHost(playerName, mapName)
+function initMPSessionHost()
 {
-        GUIObjectHide("pregame_mp_ip");
-        GUIObjectHide("pregame_subwindow_bkg");
+	var gameName = getGUIObjectByName("pregame_mp_host_gamename").caption;
+	guiSwitch ("pregame_mp_host", "pregame_mp_setup_host");
+	guiHide("pregame_mainmenu_versionnumber");
+ 
+	// Set up the server
+	var server = createServer();
+	// Welcome message
+	server.welcomeMessage = getGUIObjectByName("pregame_mp_host_welcomemsg").caption;
+	// Server Name
+	server.serverName = gameName;
+                              	
+	// start listening
+	var success = server.open();
+	if(!success) {
+		messageBox(400, 200, "Failed to start server. Please review the logfile for more information on the problem.", "Problem", 2, new Array(), new Array());
+	}
 
-        var server = createServer();
+	// Set the title for the setup screen
+	getGUIObjectByName("pregame_mp_setup_host_titlebar").caption = "Hosting: " + getGUIObjectByName("pregame_mp_host_gamename").caption;
+
+	// Set the host player's name on the setup screen
+	getGUIObjectByName("pregame_mp_setup_host_p1_txt").caption = "P1: " + getGUIObjectByName("pregame_mp_modesel_playername").caption + " (Host)";
         
-        // Set the map to use
-        g_GameAttributes.mapFile = mapName;
+	// Set the map to use
+	//g_GameAttributes.mapFile = mapName;
+
+	// -------------------------
+	// INCOMING CONNECTIONS
+	// -------------------------
+	server.onClientConnect=function (event) {
+		console.write("Client connected.");
+		//console.write("A new client has successfully connected! ID: " + event.id + ", Name: " + event.name + ", Session: " + event.session);
+		//console.write("New client.");
+		//var playerSlot = g_GameAttributes.getOpenSlot();
+		// assign a slot
+		//playerSlot.assignToSession(event.session);
+		//console.write("slot: " + playerSlot.player);
+		//console.write("got here");
+		// need to refresh the dialog control data here
+	};
+	
+	server.onClientDisconnect=function (event) {
+		console.write("Client disconnected.");
+	};	
         
-        // Set basic server options, such as:
-        // server.port = 20595; // Default is 20595 - you can also explicitly set to -1 for default port
-        server.serverPlayerName=playerName;
-        server.serverName=playerName+"'s Server";
-        server.welcomeMessage="Welcome to "+server.serverName;
+	// CHAT
+	/*server.onChat=function (event) {
+		messageBox(400, 200, event.sender+" says: "+event.message, "Chat Message", 2, new Array(), new Array());
+	};*/
 
-        // Actually start listening for connections.. This should probably not be
-        // done until there's been a dialog for filling in the previous options ;-)
-        var success = server.open();
-        if(!success) {
-                messageBox(400, 200, "Failed to start server. Please review the logfile for more information on the problem.", "Problem", 2, new Array(), new Array());
-        }
+	// Need "waiting for more players to join and start game" code here
 
-        server.onChat=function (event) {
-                messageBox(400, 200, event.sender+" says: "+event.message, "Chat Message", 2, new Array(), new Array());
-        };
-
-        // Need "waiting for more players to join and start game" code here
-
-        btCaptions = new Array("OK");
-        btCode = new Array("startLoadingScreen();");
-        messageBox(400, 200, "Waiting for clients to join - Click OK to start the game.", "Ready", 0, btCaptions, btCode);
+	/*btCaptions = new Array("OK");
+	btCode = new Array("startLoadingScreen();");
+	messageBox(400, 200, "Waiting for clients to join - Click OK to start the game.", "Ready", 0, btCaptions, btCode);*/
+	
 }
 
 // ====================================================================