diff --git a/API/Controllers/GameHubSocket.cs b/API/Controllers/GameHubSocket.cs
index d284cea..f014114 100644
--- a/API/Controllers/GameHubSocket.cs
+++ b/API/Controllers/GameHubSocket.cs
@@ -42,8 +42,6 @@ public class GameHubSocket(IGameManager gameManager) : Hub
             return;
         }
 
-        await Groups.AddToGroupAsync(Context.ConnectionId, result);
-
         await Clients.Caller.SendAsync("GameJoined", new
         {
             GameId = result,
diff --git a/API/Services/GameManager/GameManager.cs b/API/Services/GameManager/GameManager.cs
index c64a9d6..81b9677 100644
--- a/API/Services/GameManager/GameManager.cs
+++ b/API/Services/GameManager/GameManager.cs
@@ -3,6 +3,7 @@ using API.Models.DataClasses;
 using API.Models.Game;
 using API.Repository.GameRepo;
 using Microsoft.AspNetCore.SignalR;
+using System.Text.RegularExpressions;
 
 namespace API.Services.GameManager;
 
@@ -27,6 +28,8 @@ public class GameManager(IGameRepository gameRepository, IHubContext<GameHubSock
             return null;
         }
 
+        await hubContext.Groups.AddToGroupAsync(player.ConnectionId, game.Id);
+
         if (game.Players.Count == 2)
         {
             game.StartGame();
diff --git a/GUI/src/components/GameJoinMenu.vue b/GUI/src/components/GameJoinMenu.vue
index 252b18d..57974e3 100644
--- a/GUI/src/components/GameJoinMenu.vue
+++ b/GUI/src/components/GameJoinMenu.vue
@@ -17,6 +17,11 @@ let joiningModel = defineModel<JoinGameObject>('joinGameObject', {
         dein Freund gegeben hat.
       </h3>
       <v-divider class="mb-5 mt-5"></v-divider>
+      <v-text-field
+            v-model="joiningModel.playerName"
+            label="Name vom Spieler 1"
+            required
+          ></v-text-field>
       <v-otp-input
         length="6"
         v-model="joiningModel.gameCode"
diff --git a/GUI/src/routes/LocalMode.vue b/GUI/src/routes/LocalMode.vue
index 3b88874..052d107 100644
--- a/GUI/src/routes/LocalMode.vue
+++ b/GUI/src/routes/LocalMode.vue
@@ -21,7 +21,7 @@ let settings = ref<GameSettings>({
 });
 
 var currentState = ref<CurrentState>(CurrentState.CreatingGame);
-const game = ref<LocalGame>(new LocalGame(settings.value));
+const game = ref<LocalGame>(new LocalGame());
 const gameField = ref<number[][]>([]);
 const currentSelectionIndex = ref<number | null>(null);
 const gameEndedInformation = ref<GameEnded | null>(null);
diff --git a/GUI/src/routes/OnlineMode.vue b/GUI/src/routes/OnlineMode.vue
index 4cfabbf..7282855 100644
--- a/GUI/src/routes/OnlineMode.vue
+++ b/GUI/src/routes/OnlineMode.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import CreateOrJoinMenu from '@/components/CreateOrJoinMenu.vue';
+import Field from '@/components/game/Field.vue';
+import InfoField from '@/components/game/InfoField.vue';
 import GameCreationMenu from '@/components/GameCreationMenu.vue';
 import GameEndedMenu from '@/components/GameEndedMenu.vue';
 import GameJoinMenu from '@/components/GameJoinMenu.vue';
@@ -13,7 +15,6 @@ enum CurrentState {
   CreateOrJoinSelection,
   CreatingGame,
   JoiningGame,
-  WaitingForOpponent,
   Game,
   EndScreen,
 }
@@ -24,11 +25,12 @@ let settings = ref<GameSettings>({
 });
 
 let joiningModel = ref<JoinGameObject>({
+  playerName: 'Spieler 2',
   failed: false,
 });
 
 var currentState = ref<CurrentState>(CurrentState.CreateOrJoinSelection);
-const game = ref<OnlineGame>(new OnlineGame(settings.value));
+const game = ref<OnlineGame>(new OnlineGame());
 const gameField = ref<number[][]>([]);
 const currentSelectionIndex = ref<number | null>(null);
 const gameEndedInformation = ref<GameEnded | null>(null);
@@ -46,11 +48,21 @@ game.value.onGameCreated = (gameCode: string) => {
   settings.value.message = `Das Spiel ist erstellt, deine Freund kann über folgendem Code Beitreten: ${gameCode}`;
 };
 
+game.value.onGameStarted = () => {
+  currentState.value = CurrentState.Game;
+};
+
+game.value.onGameJoinedFailed = () => {
+  joiningModel.value.failed = true;
+};
+
 async function createGame() {
-    await game.value.createGame(settings.value);
+  await game.value.createGame(settings.value);
 }
 
-async function tryToJoin() {}
+async function tryToJoin() {
+  await game.value.joinGame(joiningModel.value);
+}
 </script>
 
 <template>
@@ -62,14 +74,16 @@ async function tryToJoin() {}
 
   <GameCreationMenu
     v-model:settings="settings"
-    @create-game="createGame()"
-    v-else-if="currentState === CurrentState.CreatingGame || currentState === CurrentState.WaitingForOpponent"
+    @create-game="createGame"
+    v-else-if="
+      currentState === CurrentState.CreatingGame
+    "
   />
 
   <GameJoinMenu
     :joinGameObject="joiningModel"
     v-else-if="currentState === CurrentState.JoiningGame"
-    @join="tryToJoin()"
+    @join="tryToJoin"
   />
 
   <GameEndedMenu
diff --git a/GUI/src/scripts/interfaces/JoinGameObject.ts b/GUI/src/scripts/interfaces/JoinGameObject.ts
index 6e99989..ef2ab4f 100644
--- a/GUI/src/scripts/interfaces/JoinGameObject.ts
+++ b/GUI/src/scripts/interfaces/JoinGameObject.ts
@@ -1,4 +1,5 @@
 export default interface JoinGameObject {
   failed: boolean;
-  gameCode?: number;
+  playerName: string;
+  gameCode?: string;
 }
diff --git a/GUI/src/scripts/logic/localMode/LocalGame.ts b/GUI/src/scripts/logic/localMode/LocalGame.ts
index 6923333..f113ea9 100644
--- a/GUI/src/scripts/logic/localMode/LocalGame.ts
+++ b/GUI/src/scripts/logic/localMode/LocalGame.ts
@@ -15,7 +15,7 @@ class LocalGame {
   public onGameStateChanged?: (gameState: GameInformationDto | undefined) => void;
   public onGameEnded?: (gameEndedInfo: GameEnded) => void;
 
-  constructor(settings: GameSettings) {
+  constructor() {
     this.player1 = new GameConnection();
     this.player2 = new GameConnection();
 
diff --git a/GUI/src/scripts/logic/onlineMode/OnlineGame.ts b/GUI/src/scripts/logic/onlineMode/OnlineGame.ts
index 4274391..53611c0 100644
--- a/GUI/src/scripts/logic/onlineMode/OnlineGame.ts
+++ b/GUI/src/scripts/logic/onlineMode/OnlineGame.ts
@@ -1,5 +1,10 @@
 import type { GameSettings } from '@/scripts/interfaces/GameSettings';
-import GameConnection, { type GameEnded, type GameInformationDto } from '../signalR/GameConnection';
+import GameConnection, {
+  type GameEnded,
+  type GameIdentifier,
+  type GameInformationDto,
+} from '../signalR/GameConnection';
+import type JoinGameObject from '@/scripts/interfaces/JoinGameObject';
 
 class OnlineGame {
   public player: GameConnection;
@@ -8,17 +13,51 @@ class OnlineGame {
 
   public gameState: GameInformationDto | undefined;
   public onGameCreated?: (gameCode: string) => void;
-  public onGameJoinedFailed?: (gameCode: string) => void;
+  public onGameJoinedFailed?: () => void;
+  public onGameStarted?: () => void;
   public onGameStateChanged?: (gameState: GameInformationDto | undefined) => void;
   public onGameEnded?: (gameEndedInfo: GameEnded) => void;
 
-  constructor(settings: GameSettings) {
+  constructor() {
     this.player = new GameConnection();
 
     this.player.onGameCreated = (gameIdentifier) => {
       this.gameId = gameIdentifier.gameId;
       this.onGameCreated?.(gameIdentifier.gameCode.toString());
-    }
+    };
+
+    this.player.onGameJoined = (gameIdentifier: GameIdentifier) => {
+      this.gameId = gameIdentifier.gameId;
+    };
+
+    this.player.onGameStarted = (gameInfo: GameInformationDto) => {
+      console.log("Game started!", gameInfo);
+      this.gameState = gameInfo;
+      this.onGameStarted?.();
+      this.onGameStateChanged?.(this.gameState);
+
+      this.changePlaceDescription();
+    };
+
+    this.player.onFieldUpdated = (currentState: GameInformationDto) => {
+      this.updateState(currentState);
+      this.changePlaceDescription();
+    };
+
+    this.player.onGameEnded = (gameEndedInfo: GameEnded) => {
+      this.onGameEnded?.(gameEndedInfo);
+    };
+
+    this.player.onError = (errorMessage: string) => {
+      switch (errorMessage) {
+        case 'Spiel Existiert nicht!':
+          this.onGameJoinedFailed?.();
+          this.player.disconnect();
+          break;
+        default:
+          console.error('Unhandled error:', errorMessage);
+      }
+    };
   }
 
   async createGame(settings: GameSettings) {
@@ -26,8 +65,31 @@ class OnlineGame {
     await this.player.createGame(settings.fieldSize);
   }
 
-  async drop(index: number){
+  async joinGame(joinObject: JoinGameObject) {
+    if (joinObject.gameCode?.toString().split('').length != 6 || parseInt(joinObject.gameCode) < 0) {
+      this.onGameJoinedFailed?.();
+      return;
+    }
 
+    await this.player.connect(joinObject.playerName);
+    await this.player.joinGame(parseInt(joinObject.gameCode));
+  }
+
+  async updateState(newState: GameInformationDto) {
+    if (this.gameState) {
+      this.gameState = newState;
+      this.onGameStateChanged?.(this.gameState);
+    }
+  }
+
+  async drop(index: number) {
+    await this.player.drop(this.gameId, index);
+  }
+
+  changePlaceDescription() {
+    const playerName =
+      this.gameState?.currentTurn == 1 ? this.gameState.players[0]?.name : this.gameState?.players[1]?.name;
+    this.currentDescription = `${playerName} ist dran mit setzen!`;
   }
 }