diff --git a/AGENTS.md b/AGENTS.md
index e9e2c9b..8e9f32e 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -21,10 +21,13 @@ Mobile-first React web app for tracking Schaffhauser (Jass) card game rounds usi
   6. History Screen - Game storage and export functionality
 
 ### Development Commands
-- `npm run dev` - Start development server
 - `npm run build` - Build production version
 - `npm run preview` - Preview production build
 
+### Development Server
+- A development server is always guaranteed to be running on localhost:5173
+- **Do not start the development server manually under any circumstances**
+
 ### Camera & Detection
 - Uses HTML5 Camera API with environment-facing camera preference
 - Card detection implemented with custom image processing techniques
diff --git a/package.json b/package.json
index 219c476..57bb273 100644
--- a/package.json
+++ b/package.json
@@ -2,14 +2,15 @@
   "name": "tschausepp",
   "version": "1.0.0",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --host 0.0.0.0",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
+    "@tensorflow/tfjs": "^4.19.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "@tensorflow/tfjs": "^4.19.0"
+    "react-router-dom": "^7.15.0"
   },
   "devDependencies": {
     "@types/react": "^18.3.5",
diff --git a/src/App.jsx b/src/App.jsx
index 32f801e..bcfa937 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -1,12 +1,20 @@
 import React from 'react';
+import { GameStateProvider, useGameStateContext } from './context/GameStateContext';
 import SetupScreen from './components/Setup/SetupScreen';
 import CameraScreen from './components/Camera/CameraScreen';
 import ResultsScreen from './components/Results/ResultsScreen';
 import HistoryScreen from './components/History/HistoryScreen';
-import useGameState from './hooks/useGameState';
 
 const App = () => {
-  const { gameState } = useGameState();
+  return (
+    <GameStateProvider>
+      <AppContent />
+    </GameStateProvider>
+  );
+};
+
+const AppContent = () => {
+  const { gameState } = useGameStateContext();
 
   const renderScreen = () => {
     switch (gameState.currentScreen) {
@@ -30,4 +38,4 @@ const App = () => {
   );
 };
 
-export default App;
\ No newline at end of file
+export default App;
diff --git a/src/components/Camera/CameraScreen.tsx b/src/components/Camera/CameraScreen.tsx
index 9b9ab42..76e3387 100644
--- a/src/components/Camera/CameraScreen.tsx
+++ b/src/components/Camera/CameraScreen.tsx
@@ -1,16 +1,16 @@
 import React, { useRef, useEffect } from 'react';
 import { GameState } from '../../types';
-import useGameState from '../../hooks/useGameState';
+import { useGameStateContext } from '../../context/GameStateContext';
 import Detection from '../Detection/Detection';
 import Assignment from '../Assignment/Assignment';
 
 const CameraScreen: React.FC = () => {
   const { 
     gameState, 
+    setCurrentScreen, 
     setCameraStream, 
-    scanTable, 
-    showResults 
-  } = useGameState();
+    scanTable 
+  } = useGameStateContext();
   
   const videoRef = useRef<HTMLVideoElement>(null);
   const canvasRef = useRef<HTMLCanvasElement>(null);
@@ -99,7 +99,7 @@ const CameraScreen: React.FC = () => {
     <div className="screen camera-screen">
       <div className="camera-header">
         <h2>🎥 Round <span>{gameState.currentRound}</span></h2>
-        <button onClick={() => window.location.hash = '#setup'} className="secondary">
+        <button onClick={() => gameState.setCurrentScreen('setup')} className="secondary">
           End Round
         </button>
       </div>
diff --git a/src/components/History/HistoryScreen.tsx b/src/components/History/HistoryScreen.tsx
index 35be646..4625446 100644
--- a/src/components/History/HistoryScreen.tsx
+++ b/src/components/History/HistoryScreen.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { Game } from '../../types';
-import useGameState from '../../hooks/useGameState';
+import { useGameStateContext } from '../../context/GameStateContext';
 
 const HistoryScreen: React.FC = () => {
-  const { gameState, setCurrentScreen } = useGameState();
+  const { gameState, setCurrentScreen } = useGameStateContext();
 
   const renderHistory = () => {
     if (!gameState.gameHistory || gameState.gameHistory.length === 0) {
diff --git a/src/components/Results/ResultsScreen.tsx b/src/components/Results/ResultsScreen.tsx
index bb55f80..99b9d53 100644
--- a/src/components/Results/ResultsScreen.tsx
+++ b/src/components/Results/ResultsScreen.tsx
@@ -1,13 +1,13 @@
 import React from 'react';
 import { GameState } from '../../types';
-import useGameState from '../../hooks/useGameState';
+import { useGameStateContext } from '../../context/GameStateContext';
 
 const ResultsScreen: React.FC = () => {
   const { 
     gameState, 
-    setCurrentScreen,
-    saveGame
-  } = useGameState();
+    saveGame, 
+    setCurrentScreen 
+  } = useGameStateContext();
 
   const calculateScores = () => {
     // Scoring logic based on card values
diff --git a/src/components/Setup/SetupScreen.tsx b/src/components/Setup/SetupScreen.tsx
index d2619b8..6961b4c 100644
--- a/src/components/Setup/SetupScreen.tsx
+++ b/src/components/Setup/SetupScreen.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { Player, GameState } from '../../types';
-import useGameState from '../../hooks/useGameState';
+import { useGameStateContext } from '../../context/GameStateContext';
 
 const SetupScreen: React.FC = () => {
   const { 
@@ -9,7 +9,7 @@ const SetupScreen: React.FC = () => {
     updateCardValues, 
     addPlayer, 
     startNewGame 
-  } = useGameState();
+  } = useGameStateContext();
   
   const [newPlayerName, setNewPlayerName] = useState('');
 
@@ -147,7 +147,7 @@ const SetupScreen: React.FC = () => {
         <button onClick={startGame} disabled={gameState.players.length < 2}>
           Start Game
         </button>
-        <button onClick={() => window.location.hash = '#history'} className="secondary">
+        <button onClick={() => gameState.setCurrentScreen('history')} className="secondary">
           View History
         </button>
       </div>
diff --git a/src/context/GameStateContext.tsx b/src/context/GameStateContext.tsx
new file mode 100644
index 0000000..d27c893
--- /dev/null
+++ b/src/context/GameStateContext.tsx
@@ -0,0 +1,21 @@
+import React, { createContext, useContext } from 'react';
+import useGameState from '../hooks/useGameState';
+
+const GameStateContext = createContext<any>(null);
+
+export const GameStateProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
+  const value = useGameState();
+  return (
+    <GameStateContext.Provider value={value}>
+      {children}
+    </GameStateContext.Provider>
+  );
+};
+
+export const useGameStateContext = () => {
+  const context = useContext(GameStateContext);
+  if (!context) {
+    throw new Error('useGameStateContext must be used within a GameStateProvider');
+  }
+  return context;
+};