diff --git a/src/App.vue b/src/App.vue
index 697249c..61e72ce 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -12,19 +12,17 @@
 			v-else-if="state == 'game-code'"
 			@go-to="state = $event"
 		/>
-		<div
+		<Game-Lobby
 			v-else-if="state == 'lobby'"
-			@go-to="state = $event"
-		>
-			IT'S A LOBBY
-		</div>
+		/>
 	</div>
 </template>
 
 <script>
-import JoinHost from './components/JoinHost';
-import GameCodeEntry from './components/GameCode';
-import WebsocketTests from './components/WebsocketTesting';
+import GameLobby from './views/Lobby';
+import JoinHost from './views/JoinHost';
+import GameCodeEntry from './views/GameCode';
+import WebsocketTests from './views/WebsocketTesting';
 
 export default {
 	name: 'App',
@@ -32,6 +30,7 @@ export default {
 		'WS-Test': WebsocketTests,
 		'Game-Code': GameCodeEntry,
 		'Join-Or-Host': JoinHost,
+		'Game-Lobby': GameLobby,
 	},
 	data() {return {
 		/*