diff --git a/experimental/2nub/src/client/App.tsx b/experimental/2nub/src/client/App.tsx
index 7ce4cb1..d75613c 100644
--- a/experimental/2nub/src/client/App.tsx
+++ b/experimental/2nub/src/client/App.tsx
@@ -3,6 +3,7 @@ import { GameBoard } from './components/GameBoard';
 import { CreateGame } from './components/CreateGame';
 import { GameList } from './components/GameList';
 import { useGameEvents } from './hooks/useGameEvents';
+import { SocketEventProvider } from './contexts/SocketEventContext';
 import { GameState, GameStateClient, WebSocketMessage, StateLobby } from '../types';
 import { buildApiUrl } from './config/api';
 import { sessionStorage } from './utils/sessionStorage';
@@ -86,7 +87,7 @@ const App: React.FC = () => {
     }
   }, [currentGame, currentPlayerId]);
 
-  const { isConnected, forceDisconnectPlayer, connect, authenticatePlayer, updateRuleset } = useGameEvents({
+  const { isConnected, forceDisconnectPlayer, connect, disconnect, authenticatePlayer, updateRuleset } = useGameEvents({
     onGameState,
     onGameCreated,
     onGameDeleted,
@@ -217,82 +218,92 @@ const App: React.FC = () => {
 
   // Authentication is now handled automatically in useWebSocket hook
 
+  const socketEventHandlers = {
+    isConnected,
+    forceDisconnectPlayer,
+    connect,
+    disconnect,
+    authenticatePlayer,
+    updateRuleset,
+  };
+
   return (
-    <div style={{ padding: '20px', maxWidth: '1200px', margin: '0 auto' }}>
-      <header style={{ marginBottom: '30px' }}>
-        <h1 style={{ color: '#333', marginBottom: '10px' }}>2nub Game Boilerplate</h1>
-        <div style={{ 
-          display: 'flex', 
-          alignItems: 'center', 
-          gap: '15px', 
-          marginBottom: '10px' 
-        }}>
-          <div style={{
-            display: 'flex',
-            alignItems: 'center',
-            gap: '8px',
-            padding: '4px 8px',
-            borderRadius: '4px',
-            backgroundColor: isConnected ? '#d4edda' : '#f8d7da',
-            color: isConnected ? '#155724' : '#721c24',
-            border: isConnected ? '1px solid #c3e6cb' : '1px solid #f5c6cb',
-            fontSize: '12px'
+    <SocketEventProvider eventHandlers={socketEventHandlers}>
+      <div style={{ padding: '20px', maxWidth: '1200px', margin: '0 auto' }}>
+        <header style={{ marginBottom: '30px' }}>
+          <h1 style={{ color: '#333', marginBottom: '10px' }}>2nub Game Boilerplate</h1>
+          <div style={{ 
+            display: 'flex', 
+            alignItems: 'center', 
+            gap: '15px', 
+            marginBottom: '10px' 
           }}>
             <div style={{
-              width: '8px',
-              height: '8px',
-              borderRadius: '50%',
-              backgroundColor: isConnected ? '#28a745' : '#dc3545'
-            }} />
-            {isConnected ? 'Connected' : 'Disconnected'}
-          </div>
-          {!isConnected && (
-            <button
-              onClick={connect}
-              style={{
-                padding: '4px 8px',
-                fontSize: '12px',
-                backgroundColor: '#007bff',
+              display: 'flex',
+              alignItems: 'center',
+              gap: '8px',
+              padding: '4px 8px',
+              borderRadius: '4px',
+              backgroundColor: isConnected ? '#d4edda' : '#f8d7da',
+              color: isConnected ? '#155724' : '#721c24',
+              border: isConnected ? '1px solid #c3e6cb' : '1px solid #f5c6cb',
+              fontSize: '12px'
+            }}>
+              <div style={{
+                width: '8px',
+                height: '8px',
+                borderRadius: '50%',
+                backgroundColor: isConnected ? '#28a745' : '#dc3545'
+              }} />
+              {isConnected ? 'Connected' : 'Disconnected'}
+            </div>
+            {!isConnected && (
+              <button
+                onClick={connect}
+                style={{
+                  padding: '4px 8px',
+                  fontSize: '12px',
+                  backgroundColor: '#007bff',
+                  color: 'white',
+                  border: 'none',
+                  borderRadius: '4px',
+                  cursor: 'pointer'
+                }}
+              >
+                Reconnect
+              </button>
+            )}
+            {view === 'game' && (
+              <button onClick={leaveGame} style={{
+                padding: '5px 15px',
+                backgroundColor: '#dc3545',
                 color: 'white',
                 border: 'none',
                 borderRadius: '4px',
                 cursor: 'pointer'
-              }}
-            >
-              Reconnect
-            </button>
-          )}
-          {view === 'game' && (
-            <button onClick={leaveGame} style={{
-              padding: '5px 15px',
-              backgroundColor: '#dc3545',
-              color: 'white',
-              border: 'none',
-              borderRadius: '4px',
-              cursor: 'pointer'
-            }}>
-              Leave Game
-            </button>
-          )}
-        </div>
-      </header>
+              }}>
+                Leave Game
+              </button>
+            )}
+          </div>
+        </header>
 
-      {view === 'list' ? (
-        <div style={{ display: 'grid', gap: '30px', gridTemplateColumns: '1fr 2fr' }}>
-          <CreateGame onCreateGame={createGame} />
-          <GameList games={games} onJoinGame={joinGame} onRejoinGame={attemptRejoin} onRefresh={fetchGames} />
-        </div>
-      ) : (
-        <GameBoard 
-          game={currentGame} 
-          gameId={currentGameId}
-          currentPlayerId={currentPlayerId}
-          onLeave={leaveGame}
-          onForceDisconnect={handleForceDisconnect}
-          updateRuleset={updateRuleset}
-        />
-      )}
-    </div>
+        {view === 'list' ? (
+          <div style={{ display: 'grid', gap: '30px', gridTemplateColumns: '1fr 2fr' }}>
+            <CreateGame onCreateGame={createGame} />
+            <GameList games={games} onJoinGame={joinGame} onRejoinGame={attemptRejoin} onRefresh={fetchGames} />
+          </div>
+        ) : (
+          <GameBoard 
+            game={currentGame} 
+            gameId={currentGameId}
+            currentPlayerId={currentPlayerId}
+            onLeave={leaveGame}
+            onForceDisconnect={handleForceDisconnect}
+          />
+        )}
+      </div>
+    </SocketEventProvider>
   );
 };
 
diff --git a/experimental/2nub/src/client/components/GameBoard.tsx b/experimental/2nub/src/client/components/GameBoard.tsx
index 0c33b50..7901df9 100644
--- a/experimental/2nub/src/client/components/GameBoard.tsx
+++ b/experimental/2nub/src/client/components/GameBoard.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { GameStateClient, StateLobby } from '../../types';
+import { GameStateClient } from '../../types';
 import { Onub } from './Onub';
 
 interface GameBoardProps {
@@ -8,10 +8,9 @@ interface GameBoardProps {
   currentPlayerId: string | null;
   onLeave: () => void;
   onForceDisconnect: (playerId: string) => void;
-  updateRuleset: (ruleset: StateLobby["ruleset"]) => void;
 }
 
-export const GameBoard: React.FC<GameBoardProps> = ({ game, gameId, currentPlayerId, onLeave, onForceDisconnect, updateRuleset }) => {
+export const GameBoard: React.FC<GameBoardProps> = ({ game, gameId, currentPlayerId, onLeave, onForceDisconnect }) => {
   console.debug("Rendering GameBoard with game:", game);
   const [disconnectingPlayerId, setDisconnectingPlayerId] = useState<string | null>(null);
 
@@ -231,7 +230,7 @@ export const GameBoard: React.FC<GameBoardProps> = ({ game, gameId, currentPlaye
         )}
       </div>
 
-      {currentPlayerId && <Onub game={game} currentPlayerId={currentPlayerId} updateRuleset={updateRuleset} />}
+      {currentPlayerId && <Onub game={game} currentPlayerId={currentPlayerId} />}
     </div>
   );
 };
\ No newline at end of file
diff --git a/experimental/2nub/src/client/components/Onub.tsx b/experimental/2nub/src/client/components/Onub.tsx
index de90f52..1110f7c 100644
--- a/experimental/2nub/src/client/components/Onub.tsx
+++ b/experimental/2nub/src/client/components/Onub.tsx
@@ -1,14 +1,13 @@
 import React, { useState } from 'react';
-import { GameStateClient, StateLobby } from '../../types';
+import { GameStateClient } from '../../types';
 import { OnubLobby } from './OnubLobby';
 
 interface OnubProps {
 	game: GameStateClient;
 	currentPlayerId: string;
-	updateRuleset: (ruleset: StateLobby["ruleset"]) => void;
 }
 
-export const Onub: React.FC<OnubProps> = ({ game, currentPlayerId, updateRuleset }) => {
+export const Onub: React.FC<OnubProps> = ({ game, currentPlayerId }) => {
 	let content = <div>
 		<p style={{ margin: '0 0 15px 0', color: '#666' }}>
 			This is where the actual game would be implemented. The boilerplate provides:
@@ -32,7 +31,7 @@ export const Onub: React.FC<OnubProps> = ({ game, currentPlayerId, updateRuleset
 
 	switch (game.state.state) {
 		case 'lobby':
-			content = <OnubLobby stateLobby={game.state} playerCount={game.players.length} currentPlayerId={currentPlayerId} updateRuleset={updateRuleset} />;
+			content = <OnubLobby stateLobby={game.state} playerCount={game.players.length} currentPlayerId={currentPlayerId} />;
 		default:
 		//throw new Error(`Onub component: Unsupported game state "${game.state.state}"`);
 	}
diff --git a/experimental/2nub/src/client/components/OnubLobby.tsx b/experimental/2nub/src/client/components/OnubLobby.tsx
index f479fc9..e3fcff5 100644
--- a/experimental/2nub/src/client/components/OnubLobby.tsx
+++ b/experimental/2nub/src/client/components/OnubLobby.tsx
@@ -1,14 +1,15 @@
 import React from 'react';
 import { GameStateClient, RoleId, ROLES, StateLobby } from '../../types';
+import { useSocketEvents } from '../hooks/useSocketEvents';
 
 interface OnubLobbyProps {
     stateLobby: StateLobby;
     playerCount: number;
     currentPlayerId: string;
-    updateRuleset: (ruleset: StateLobby["ruleset"]) => void;
 }
 
-export const OnubLobby: React.FC<OnubLobbyProps> = ({ stateLobby, playerCount, currentPlayerId, updateRuleset }) => {
+export const OnubLobby: React.FC<OnubLobbyProps> = ({ stateLobby, playerCount, currentPlayerId }) => {
+    const { updateRuleset } = useSocketEvents();
     console.debug("Player count: ", playerCount);
 
     function makeRoleAddHandler(roleId: RoleId): React.MouseEventHandler<HTMLButtonElement> {
diff --git a/experimental/2nub/src/client/contexts/SocketEventContext.tsx b/experimental/2nub/src/client/contexts/SocketEventContext.tsx
new file mode 100644
index 0000000..77fa8c8
--- /dev/null
+++ b/experimental/2nub/src/client/contexts/SocketEventContext.tsx
@@ -0,0 +1,37 @@
+import React, { createContext, useContext, ReactNode } from 'react';
+import { StateLobby } from '../../types';
+
+export interface SocketEventContextType {
+  isConnected: boolean;
+  forceDisconnectPlayer: (gameId: string, playerId: string) => Promise<void>;
+  connect: () => void;
+  disconnect: () => void;
+  authenticatePlayer: (gameId: string, playerId: string) => void;
+  updateRuleset: (ruleset: StateLobby["ruleset"]) => void;
+}
+
+const SocketEventContext = createContext<SocketEventContextType | null>(null);
+
+interface SocketEventProviderProps {
+  children: ReactNode;
+  eventHandlers: SocketEventContextType;
+}
+
+export const SocketEventProvider: React.FC<SocketEventProviderProps> = ({ 
+  children, 
+  eventHandlers 
+}) => {
+  return (
+    <SocketEventContext.Provider value={eventHandlers}>
+      {children}
+    </SocketEventContext.Provider>
+  );
+};
+
+export const useSocketEventContext = (): SocketEventContextType => {
+  const context = useContext(SocketEventContext);
+  if (!context) {
+    throw new Error('useSocketEventContext must be used within a SocketEventProvider');
+  }
+  return context;
+};
\ No newline at end of file
diff --git a/experimental/2nub/src/client/hooks/useSocketEvents.ts b/experimental/2nub/src/client/hooks/useSocketEvents.ts
new file mode 100644
index 0000000..da47158
--- /dev/null
+++ b/experimental/2nub/src/client/hooks/useSocketEvents.ts
@@ -0,0 +1,5 @@
+import { useSocketEventContext } from '../contexts/SocketEventContext';
+
+export const useSocketEvents = () => {
+  return useSocketEventContext();
+};
\ No newline at end of file