diff --git a/pac-man-board-game/ClientApp/src/components/gameBoard.tsx b/pac-man-board-game/ClientApp/src/components/gameBoard.tsx
index f828cae..146edde 100644
--- a/pac-man-board-game/ClientApp/src/components/gameBoard.tsx
+++ b/pac-man-board-game/ClientApp/src/components/gameBoard.tsx
@@ -57,10 +57,18 @@ const Board: Component<BoardProps> = (
     const takenChar = characters.find(c => c.isPacMan() && c.isAt(destination.End));
     if (takenChar) {
       takenChar.moveToSpawn();
-      // TODO steal from other player
+      stealFromPlayer();
     }
   }
 
+  // TODO steal from other player
+  function stealFromPlayer(): void {
+    // TODO select player to steal from
+    // TODO modal to select player
+    // const victim
+    // currentPlayer?.stealFrom(victim)
+  }
+
   function pickUpPellets(destination: Path): Position[] {
     const positions: Position[] = [];
     if (selectedCharacter?.isPacMan()) {
diff --git a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
index 0b9d662..31c3cd4 100644
--- a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
+++ b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
@@ -3,28 +3,33 @@ import {AllDice} from "./dice";
 import {doAction, GameAction} from "../utils/actions";
 import GameBoard from "./gameBoard";
 import WebSocketService from "../websockets/WebSocketService";
-import {getCharacterSpawns, testMap} from "../game/map";
+import {getCharacterSpawns} from "../game/map";
 import Player from "../game/player";
 import PlayerStats from "../components/playerStats";
-import {getDefaultStore, useAtom, useAtomValue, useSetAtom} from "jotai";
+import {useAtom, useAtomValue, useSetAtom} from "jotai";
 import {diceAtom, ghostsAtom, playersAtom, rollDiceButtonAtom, selectedDiceAtom} from "../utils/state";
 import {CharacterType} from "../game/character";
 import GameButton from "./gameButton";
 
 const wsService = new WebSocketService(import.meta.env.VITE_API);
 
+// TODO ghost should be able to take pacmen
+
 // TODO don't start game until at least 2 players have joined
 // TODO join game lobby
+// TODO sign up player page
+// TODO sign in page
 // TODO steal from other players
 // TODO show box with collected pellets
 // TODO layout
 
-export const GameComponent: Component<{ player: Player }> = ({player}) => {
-  const players = useAtomValue(playersAtom);
+export const GameComponent: Component<{ player: Player, map: GameMap }> = ({player, map}) => {
 
+  const players = useAtomValue(playersAtom);
   const dice = useAtomValue(diceAtom);
   const [selectedDice, setSelectedDice] = useAtom(selectedDiceAtom);
   const setActiveRollDiceButton = useSetAtom(rollDiceButtonAtom);
+  const ghosts = useAtomValue(ghostsAtom);
 
   function rollDice(): void {
     if (!player.isTurn()) return;
@@ -44,7 +49,7 @@ export const GameComponent: Component<{ player: Player }> = ({player}) => {
       Data: {
         Dice: dice?.length ?? 0 > 0 ? dice : null,
         Players: players,
-        Ghosts: getDefaultStore().get(ghostsAtom),
+        Ghosts: ghosts,
         EatenPellets: eatenPellets
       }
     };
@@ -59,7 +64,7 @@ export const GameComponent: Component<{ player: Player }> = ({player}) => {
     wsService.send({
       Action: GameAction.playerInfo,
       Data: {
-        Player: player, Spawns: getCharacterSpawns(testMap)
+        Player: player, Spawns: getCharacterSpawns(map)
           .filter(s => s.type === CharacterType.pacMan)
           .map(s => s.position)
       }
@@ -70,7 +75,7 @@ export const GameComponent: Component<{ player: Player }> = ({player}) => {
     wsService.send({Action: GameAction.ready});
   }
 
-  function endTurn() {
+  function endTurn(): void {
     wsService.send({Action: GameAction.nextPlayer});
   }
 
@@ -92,7 +97,7 @@ export const GameComponent: Component<{ player: Player }> = ({player}) => {
       <div className={"flex justify-center"}>
         {players?.map(p => <PlayerStats key={p.Name} player={p}/>)}
       </div>
-      <GameBoard className={"mx-auto my-2"} onMove={onCharacterMove} map={testMap}/>
+      <GameBoard className={"mx-auto my-2"} onMove={onCharacterMove} map={map}/>
     </>
   );
 };
diff --git a/pac-man-board-game/ClientApp/src/pages/game.tsx b/pac-man-board-game/ClientApp/src/pages/game.tsx
index 5811a9b..f0173b6 100644
--- a/pac-man-board-game/ClientApp/src/pages/game.tsx
+++ b/pac-man-board-game/ClientApp/src/pages/game.tsx
@@ -2,6 +2,7 @@ import React, {useEffect} from "react";
 import {GameComponent} from "../components/gameComponent";
 import {useAtomValue} from "jotai";
 import {thisPlayerAtom} from "../utils/state";
+import {testMap} from "../game/map";
 
 const Game: Component = () => {
   const player = useAtomValue(thisPlayerAtom);
@@ -15,7 +16,7 @@ const Game: Component = () => {
   }, [player]);
 
   if (player) {
-    return <GameComponent player={player}/>;
+    return <GameComponent player={player} map={testMap}/>;
   } else {
     return null;
   }
diff --git a/pac-man-board-game/Controllers/GameController.cs b/pac-man-board-game/Controllers/GameController.cs
index d2e27b4..f3c3106 100644
--- a/pac-man-board-game/Controllers/GameController.cs
+++ b/pac-man-board-game/Controllers/GameController.cs
@@ -30,4 +30,10 @@ public class GameController : GenericController // TODO reconnect using player i
         _actionService.DoAction(action);
         return action.ToArraySegment();
     }
+
+    protected override void Disconnect()
+    {
+        base.Disconnect();
+        _actionService.Disconnect();
+    }
 }
diff --git a/pac-man-board-game/Controllers/GenericController.cs b/pac-man-board-game/Controllers/GenericController.cs
index f915c4f..cba5bca 100644
--- a/pac-man-board-game/Controllers/GenericController.cs
+++ b/pac-man-board-game/Controllers/GenericController.cs
@@ -66,8 +66,10 @@ public abstract class GenericController : ControllerBase
             Logger.Log(LogLevel.Error, "{}", e.Message);
         }
 
-        WsService.Connections -= WsServiceOnFire;
+        Disconnect();
     }
 
     protected abstract ArraySegment<byte> Run(WebSocketReceiveResult result, byte[] data);
+
+    protected virtual void Disconnect() => WsService.Connections -= WsServiceOnFire;
 }
diff --git a/pac-man-board-game/Services/ActionService.cs b/pac-man-board-game/Services/ActionService.cs
index 92af00a..fd210e4 100644
--- a/pac-man-board-game/Services/ActionService.cs
+++ b/pac-man-board-game/Services/ActionService.cs
@@ -15,6 +15,7 @@ public interface IActionService
     List<IPlayer> SetPlayerInfo(ActionMessage message);
     object Ready();
     string FindNextPlayer();
+    void Disconnect();
 }
 
 public class ActionService : IActionService
@@ -96,6 +97,11 @@ public class ActionService : IActionService
     }
 
     public string FindNextPlayer() => Group?.NextPlayer().Name ?? "Error: No group found";
+
+    public void Disconnect()
+    {
+        if (Player != null) Player.State = State.Disconnected;
+    }
 }
 
 public struct PlayerInfoData