diff --git a/public/js/main.js b/public/js/main.js
index 24a158e..c160e46 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -14,6 +14,10 @@ function openClientPopup(ip,port,placefile,mode) {
     } else if (mode == "join") {
         // user is joining a game, use ip and port
         window.location.href = "archblox://join/" + port + ":" + ip;
+    } else if (mode == "hostandjoin") {
+        // user is hosting and joining their own game, use everything
+        window.location.href = "archblox://host/" + port + ":" + placefile;
+        window.location.href = "archblox://join/" + port + ":" + ip;
     } else {
         // no information so just use the default
         window.location.href = "archblox://";
diff --git a/resources/views/pages/gamepage.blade.php b/resources/views/pages/gamepage.blade.php
index 6a375b5..1c900a2 100644
--- a/resources/views/pages/gamepage.blade.php
+++ b/resources/views/pages/gamepage.blade.php
@@ -21,7 +21,10 @@
     <div class="rightgamecontainer">
         <h1>Natural Disaster Survival</h1> 
         <p>By <a href="{{ route('profile', 1) }}">ARCHBLOX</a></p>
-        <button onclick="openClientPopup(null,'53640','temp.rbxl','host')" class="greenbutton" style="width: 100%; height: 50px; font-size: x-large; margin-top: 115px; align-content: center;">Host</button>
+        <p style="text-align: center;">
+            <button onclick="openClientPopup('localhost','53640','temp.rbxl','hostandplay')" class="greenbutton" style="width: 70%; height: 50px; font-size: x-large; margin-top: 115px; align-content: center;">Host &amp; Play</button>
+            <button onclick="openClientPopup(null,'53640','temp.rbxl','host')" class="greenbutton" style="width: 27%;height: 50px;margin-top: 0px;font-size: x-large;align-content: center;">Host</button>
+        </p>
     </div>
 </div>
 <br>