diff --git a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
index 0209638..1b52fe4 100644
--- a/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
+++ b/pac-man-board-game/ClientApp/src/components/gameComponent.tsx
@@ -17,6 +17,7 @@ const wsService = new WebSocketService(import.meta.env.VITE_API_WS);
 // TODO bug, when refreshing page, the characters are reset for all players
 // TODO bug, when refreshing page, some data is missing until other clients make a move
 
+// TODO store map in backend and save it in state on each client
 // TODO add debug menu on dev, for testing and cheating
 // TODO join/new game lobby
 // TODO sign up player page
diff --git a/pac-man-board-game/ClientApp/src/utils/state.ts b/pac-man-board-game/ClientApp/src/utils/state.ts
index 1f6a874..99ec315 100644
--- a/pac-man-board-game/ClientApp/src/utils/state.ts
+++ b/pac-man-board-game/ClientApp/src/utils/state.ts
@@ -53,3 +53,7 @@ export const currentPlayerAtom = atom<Player | undefined>(get => {
  * Whether the roll dice button should be enabled.
  */
 export const rollDiceButtonAtom = atom(true);
+/**
+ * The map that is currently selected.
+ */
+export const selectedMapAtom = atom<GameMap | undefined>(undefined);