diff --git a/api/app/Http/Controllers/MatchController.php b/api/app/Http/Controllers/MatchController.php
index 444ccc9..bcedc9a 100644
--- a/api/app/Http/Controllers/MatchController.php
+++ b/api/app/Http/Controllers/MatchController.php
@@ -10,7 +10,7 @@ use App\Http\Requests\StoreMatchRequest;
 use Illuminate\Support\Facades\DB;
 
 class MatchController extends Controller
-{    
+{
     public function index(Request $request)
     {
         $query = MatchGame::query()->with(['winner', 'player1', 'player2']);
@@ -29,9 +29,9 @@ class MatchController extends Controller
     }
 
     public function store(StoreMatchRequest $request)
-    {        
+    {
         $validated = $request->validated();
-        $user = $request->user(); 
+        $user = $request->user();
         $stake = $validated['stake'];
 
         if ($user->coins_balance < $stake) {
@@ -43,7 +43,7 @@ class MatchController extends Controller
               ->orWhere('player2_user_id', $user->id);
         })->whereIn('status', ['Pending', 'Playing'])->exists();
 
-        if ($activeMatch) { 
+        if ($activeMatch) {
             return response()->json(['message' => 'You already have an active match.'], 400);
         }
 
@@ -61,7 +61,7 @@ class MatchController extends Controller
                 'type' => $validated['type'],
                 'status' => 'Pending',
                 'player1_user_id' => $user->id,
-                'player2_user_id' => $GHOST_ID, 
+                'player2_user_id' => $GHOST_ID,
                 'winner_user_id' => $GHOST_ID,
                 'loser_user_id' => $GHOST_ID,
                 'stake' => $stake,
@@ -129,7 +129,7 @@ class MatchController extends Controller
                 'match_id' => $match->id,
                 'coin_transaction_type_id' => $stakeType->id,
                 'transaction_datetime' => now(),
-                'coins' => -$match->stake, 
+                'coins' => -$match->stake,
             ]);
 
             $match->update([
@@ -163,7 +163,7 @@ class MatchController extends Controller
         ]);
 
         return DB::transaction(function () use ($match, $data) {
-            
+
             if (isset($data['status']) && $data['status'] === 'Ended') {
                 $data['ended_at'] = now();
             }
@@ -171,7 +171,7 @@ class MatchController extends Controller
             $match->update($data);
 
             if ($match->status === 'Ended' && $match->stake > 0 && $match->winner_user_id) {
-                
+
                 $payoutType = CoinTransactionType::firstOrCreate(
                     ['name' => 'Match payout'],
                     ['type' => 'C'] // Credit
@@ -232,7 +232,7 @@ class MatchController extends Controller
                 'type' => $request->type,
                 'status' => 'Pending',
                 'player1_user_id' => $user->id,
-                'player2_user_id' => $GHOST_ID, 
+                'player2_user_id' => $GHOST_ID,
                 'winner_user_id' => null,
                 'loser_user_id' => null,
                 'stake' => $stake,
@@ -255,16 +255,21 @@ class MatchController extends Controller
 
     public function open(Request $request)
     {
-        $type = $request->query('type', '9');
-        $GHOST_ID = 1;
+        // FIX: Allow matches where P2 is NULL OR 'Ghost' (ID 1)
+        $query = MatchGame::where('status', 'Pending')
+            ->where(function($q) {
+                $q->whereNull('player2_user_id')
+                  ->orWhere('player2_user_id', 1); // 1 = Ghost ID
+            });
 
-        $matches = MatchGame::where('status', 'Pending')
-            ->where('player2_user_id', $GHOST_ID) 
-            ->where('type', $type)
-            ->with('player1')
-            ->orderBy('began_at', 'asc')
+        if ($request->has('type')) {
+            $query->where('type', $request->type);
+        }
+
+        $matches = $query->with('player1:id,nickname')
+            ->orderBy('began_at', 'desc')
             ->paginate(10);
 
         return response()->json($matches);
     }
-}
\ No newline at end of file
+}
diff --git a/api/routes/api.php b/api/routes/api.php
index d04aa94..7698599 100644
--- a/api/routes/api.php
+++ b/api/routes/api.php
@@ -58,10 +58,11 @@ Route::prefix('v1')->group(function () {
         });
 
         Route::prefix('matches')->group(function () {
-            Route::apiResource('/', MatchController::class)->parameters(['' => 'match']);
-            Route::post('/{match}/join', [MatchController::class, 'join']);
-            Route::post('host', [MatchController::class, 'host']); // <--- NOVA
+            Route::post('host', [MatchController::class, 'host']);
             Route::get('open', [MatchController::class, 'open']);
+            Route::post('/{match}/join', [MatchController::class, 'join']);
+            Route::post('/{match}/start', [MatchController::class, 'start']); // Changed to /start to be explicit
+            Route::apiResource('/', MatchController::class)->parameters(['' => 'match']);
         });
 
         // Admin Routes
diff --git a/frontend/package.json b/frontend/package.json
index 11ff168..1204dbd 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@tailwindcss/vite": "^4.1.17",
     "@tanstack/vue-table": "^8.21.3",
-    "@vueuse/core": "^14.0.0",
+    "@vueuse/core": "^14.1.0",
     "axios": "^1.13.2",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
@@ -24,7 +24,7 @@
     "lucide-react": "^0.562.0",
     "lucide-vue-next": "^0.554.0",
     "pinia": "^3.0.3",
-    "reka-ui": "^2.6.0",
+    "reka-ui": "^2.7.0",
     "socket.io-client": "^4.8.1",
     "tailwind-merge": "^3.4.0",
     "tailwindcss": "^4.1.17",
diff --git a/frontend/src/components/layout/NavBar.vue b/frontend/src/components/layout/NavBar.vue
index 60230b9..2970722 100644
--- a/frontend/src/components/layout/NavBar.vue
+++ b/frontend/src/components/layout/NavBar.vue
@@ -92,4 +92,4 @@ watch(() => userLoggedIn, async (isLoggedIn) => {
         userStore.coins = 0
     }
 }, { immediate: true })
-</script>
\ No newline at end of file
+</script>
diff --git a/frontend/src/components/ui/label/Label.vue b/frontend/src/components/ui/label/Label.vue
new file mode 100644
index 0000000..b20aec0
--- /dev/null
+++ b/frontend/src/components/ui/label/Label.vue
@@ -0,0 +1,29 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { Label } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  for: { type: String, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  class: { type: null, required: false },
+});
+
+const delegatedProps = reactiveOmit(props, "class");
+</script>
+
+<template>
+  <Label
+    data-slot="label"
+    v-bind="delegatedProps"
+    :class="
+      cn(
+        'flex items-center gap-2 text-sm leading-none font-medium select-none group-data-[disabled=true]:pointer-events-none group-data-[disabled=true]:opacity-50 peer-disabled:cursor-not-allowed peer-disabled:opacity-50',
+        props.class,
+      )
+    "
+  >
+    <slot />
+  </Label>
+</template>
diff --git a/frontend/src/components/ui/label/index.js b/frontend/src/components/ui/label/index.js
new file mode 100644
index 0000000..38eaa35
--- /dev/null
+++ b/frontend/src/components/ui/label/index.js
@@ -0,0 +1 @@
+export { default as Label } from "./Label.vue";
diff --git a/frontend/src/components/ui/switch/Switch.vue b/frontend/src/components/ui/switch/Switch.vue
new file mode 100644
index 0000000..215ffac
--- /dev/null
+++ b/frontend/src/components/ui/switch/Switch.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { reactiveOmit } from "@vueuse/core";
+import { SwitchRoot, SwitchThumb, useForwardPropsEmits } from "reka-ui";
+import { cn } from "@/lib/utils";
+
+const props = defineProps({
+  defaultValue: { type: Boolean, required: false },
+  modelValue: { type: [Boolean, null], required: false },
+  disabled: { type: Boolean, required: false },
+  id: { type: String, required: false },
+  value: { type: String, required: false },
+  asChild: { type: Boolean, required: false },
+  as: { type: null, required: false },
+  name: { type: String, required: false },
+  required: { type: Boolean, required: false },
+  class: { type: null, required: false },
+});
+
+const emits = defineEmits(["update:modelValue"]);
+
+const delegatedProps = reactiveOmit(props, "class");
+
+const forwarded = useForwardPropsEmits(delegatedProps, emits);
+</script>
+
+<template>
+  <SwitchRoot
+    v-slot="slotProps"
+    data-slot="switch"
+    v-bind="forwarded"
+    :class="
+      cn(
+        'peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 inline-flex h-[1.15rem] w-8 shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50',
+        props.class,
+      )
+    "
+  >
+    <SwitchThumb
+      data-slot="switch-thumb"
+      :class="
+        cn(
+          'bg-background dark:data-[state=unchecked]:bg-foreground dark:data-[state=checked]:bg-primary-foreground pointer-events-none block size-4 rounded-full ring-0 transition-transform data-[state=checked]:translate-x-[calc(100%-2px)] data-[state=unchecked]:translate-x-0',
+        )
+      "
+    >
+      <slot name="thumb" v-bind="slotProps" />
+    </SwitchThumb>
+  </SwitchRoot>
+</template>
diff --git a/frontend/src/components/ui/switch/index.js b/frontend/src/components/ui/switch/index.js
new file mode 100644
index 0000000..c986f8a
--- /dev/null
+++ b/frontend/src/components/ui/switch/index.js
@@ -0,0 +1 @@
+export { default as Switch } from "./Switch.vue";
diff --git a/frontend/src/pages/game/MultiplayerMatchPage.vue b/frontend/src/pages/game/MultiplayerMatchPage.vue
new file mode 100644
index 0000000..003506c
--- /dev/null
+++ b/frontend/src/pages/game/MultiplayerMatchPage.vue
@@ -0,0 +1,112 @@
+<template>
+  <div class="relative min-h-screen bg-slate-950 text-white">
+
+    <div class="fixed top-0 left-0 right-0 z-40 bg-slate-900/90 backdrop-blur border-b border-slate-700 p-2 shadow-lg">
+        <div class="max-w-4xl mx-auto flex items-center justify-between">
+
+            <div class="flex flex-col items-start">
+                <div class="flex items-center gap-2">
+                    <span class="font-bold text-lg text-blue-400">{{ myName }}</span>
+                    <span v-if="matchState.wager > 0" class="flex items-center text-xs text-yellow-400 bg-yellow-400/10 px-2 rounded">
+                        <Coins class="w-3 h-3 mr-1" /> {{ matchState.wager }}
+                    </span>
+                </div>
+                <div class="flex gap-1 mt-1">
+                    <div class="w-3 h-3 rounded-full border border-blue-500"
+                         :class="{ 'bg-blue-500': matchState.myWins >= 1 }"></div>
+                    <div class="w-3 h-3 rounded-full border border-blue-500"
+                         :class="{ 'bg-blue-500': matchState.myWins >= 2 }"></div>
+                </div>
+            </div>
+
+            <div class="flex flex-col items-center">
+                <span class="text-xs uppercase tracking-widest text-slate-400">Match {{ matchState.id }}</span>
+                <span class="text-xl font-black font-mono">
+                    {{ matchState.myWins }} - {{ matchState.oppWins }}
+                </span>
+                <span class="text-[10px] text-slate-500">Best of 3</span>
+            </div>
+
+            <div class="flex flex-col items-end">
+                <span class="font-bold text-lg text-red-400">{{ opponentName }}</span>
+                <div class="flex gap-1 mt-1">
+                    <div class="w-3 h-3 rounded-full border border-red-500"
+                         :class="{ 'bg-red-500': matchState.oppWins >= 1 }"></div>
+                    <div class="w-3 h-3 rounded-full border border-red-500"
+                         :class="{ 'bg-red-500': matchState.oppWins >= 2 }"></div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="pt-20 h-screen">
+        <GameBoard
+            v-if="matchState.currentGameId && !matchOver"
+            :game-id="matchState.currentGameId"
+            @game-end="handleGameEnd"
+        />
+
+        <div v-else-if="!matchOver" class="flex h-full items-center justify-center flex-col gap-4">
+             <div class="text-2xl font-bold animate-pulse">Preparing next round...</div>
+             <p class="text-slate-400">Switching sides and shuffling deck</p>
+        </div>
+
+        <div v-if="matchOver" class="absolute inset-0 z-50 flex items-center justify-center bg-black/80 backdrop-blur-md">
+            <div class="text-center space-y-6 p-8 bg-slate-900 border-2 border-purple-500 rounded-2xl shadow-2xl max-w-md w-full">
+                <Trophy v-if="iWonMatch" class="w-20 h-20 text-yellow-400 mx-auto animate-bounce" />
+                <Frown v-else class="w-20 h-20 text-slate-500 mx-auto" />
+
+                <div>
+                    <h1 class="text-4xl font-black uppercase mb-2"
+                        :class="iWonMatch ? 'text-yellow-400' : 'text-slate-400'">
+                        {{ iWonMatch ? 'Victory!' : 'Defeat' }}
+                    </h1>
+                    <p class="text-slate-300">Final Score: {{ matchState.myWins }} - {{ matchState.oppWins }}</p>
+                </div>
+
+                <div v-if="matchState.wager > 0" class="bg-yellow-500/10 p-4 rounded-xl border border-yellow-500/20">
+                    <p class="text-xs uppercase text-yellow-600 font-bold mb-1">Total Reward</p>
+                    <div class="flex items-center justify-center gap-2 text-2xl font-bold text-yellow-400">
+                        <Coins class="w-6 h-6" />
+                        <span>{{ iWonMatch ? '+' + (matchState.wager * 2) : '-' + matchState.wager }}</span>
+                    </div>
+                </div>
+
+                <Button @click="leaveMatch" class="w-full bg-purple-600 hover:bg-purple-700">
+                    Return to Lobby
+                </Button>
+            </div>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+// Imports and setup similar to GamePage, but tracking Match State
+import { ref, onMounted, computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { Coins, Trophy, Frown } from 'lucide-vue-next'
+import GameBoard from '@/components/game/GameBoard.vue' // Reuse your existing board logic
+import axios from 'axios'
+// ... socket logic for match_updates ...
+
+const matchState = ref({
+    id: null,
+    wager: 0,
+    myWins: 0,
+    oppWins: 0,
+    currentGameId: null,
+    players: {}
+})
+
+const matchOver = computed(() => matchState.value.myWins >= 2 || matchState.value.oppWins >= 2)
+const iWonMatch = computed(() => matchState.value.myWins > matchState.value.oppWins)
+
+// This function listens for Socket events on the "Match Channel"
+// e.g., channel: `match.{id}` event: `RoundEnded`
+const listenToMatch = () => {
+    // When a game ends, the server should send:
+    // { nextGameId: 123, scores: { p1: 1, p2: 0 } }
+    // Update matchState.currentGameId to trigger the GameBoard to reload
+}
+</script>
diff --git a/frontend/src/pages/home/HomePage.vue b/frontend/src/pages/home/HomePage.vue
index a94705b..fb52f5d 100644
--- a/frontend/src/pages/home/HomePage.vue
+++ b/frontend/src/pages/home/HomePage.vue
@@ -1,18 +1,24 @@
 <script setup>
-import { User, Trophy } from 'lucide-vue-next'
-import { ref, onMounted, nextTick, inject } from 'vue'
+import { User, Trophy, Coins } from 'lucide-vue-next'
+import { ref, onMounted, nextTick, inject, computed } from 'vue'
 import { Button } from '@/components/ui/button'
+import { Input } from '@/components/ui/input'
+import { Label } from '@/components/ui/label'
+import { Switch } from '@/components/ui/switch'
+import { watch } from 'vue';
 import {
-    Card,
-    CardContent,
-    CardDescription,
-    CardHeader,
-    CardTitle
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle
 } from '@/components/ui/card'
 import { useAPIStore } from '@/stores/api'
 import { useRouter } from 'vue-router'
 import { useAuthStore } from '@/stores/auth'
+import { useUserStore } from '@/stores/user'
 import axios from 'axios'
+import { toast } from 'vue-sonner'
 
 const API_BASE_URL = inject('apiBaseURL')
 const apiStore = useAPIStore()
@@ -44,545 +50,631 @@ const lbObserver = ref(null)
 const lbMorePages = ref(true)
 const publicStats = ref(null)
 const isLoggedIn = useAuthStore().isLoggedIn
+const isBestOfThree = ref(false)
+const wagerAmount = ref(0)
+const authStore = useAuthStore()
+const userStore = useUserStore()
+const userLoggedIn = computed(() => authStore.isLoggedIn)
+const userCoins = ref(0)
+const hostLoading = ref(false)
 
 const setupMatchesObserver = () => {
-    if (mObserver.value) mObserver.value.disconnect();
+  if (mObserver.value) mObserver.value.disconnect();
 
-    mObserver.value = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && !mLoading.value && openMatches.value.length > 0) {
-            getPendingMatches();
-        }
-    }, { threshold: 0.1 });
-
-    if (mObserverTarget.value) {
-        mObserver.value.observe(mObserverTarget.value);
+  mObserver.value = new IntersectionObserver((entries) => {
+    if (entries[0].isIntersecting && !mLoading.value && openMatches.value.length > 0) {
+      getPendingMatches();
     }
+  }, { threshold: 0.1 });
+
+  if (mObserverTarget.value) {
+    mObserver.value.observe(mObserverTarget.value);
+  }
 }
 
 const setupGamesObserver = () => {
-    if (gObserver.value) gObserver.value.disconnect();
+  if (gObserver.value) gObserver.value.disconnect();
 
-    gObserver.value = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && !gLoading.value && openGames.value.length > 0) {
-            getPendingGames();
-        }
-    }, { threshold: 0.1 });
-
-    if (gObserverTarget.value) {
-        gObserver.value.observe(gObserverTarget.value);
+  gObserver.value = new IntersectionObserver((entries) => {
+    if (entries[0].isIntersecting && !gLoading.value && openGames.value.length > 0) {
+      getPendingGames();
     }
+  }, { threshold: 0.1 });
+
+  if (gObserverTarget.value) {
+    gObserver.value.observe(gObserverTarget.value);
+  }
 }
 
 const getPendingGames = async (mode = selectedMode.value) => {
-    if (gLoading.value) return;
-    gLoading.value = true;
+  if (gLoading.value) return;
+  gLoading.value = true;
 
-    try {
-        const response = await axios.get(`${API_BASE_URL}/games/open`, {
-            params: {
-                type: mode,
-                page: gPage.value
-            }
-        });
+  try {
+    const response = await axios.get(`${API_BASE_URL}/games/open`, {
+      params: {
+        type: mode,
+        page: gPage.value
+      }
+    });
 
-        const newGames = response.data.data;
-        openGames.value = [...openGames.value, ...newGames];
-    } finally {
-        gLoading.value = false;
-    }
+    const newGames = response.data.data;
+    openGames.value = [...openGames.value, ...newGames];
+  } finally {
+    gLoading.value = false;
+  }
 }
 
 const getPendingMatches = async (mode = selectedMode.value) => {
-    if (mLoading.value) return;
-    mLoading.value = true;
+  if (mLoading.value) return;
+  mLoading.value = true;
 
-    try {
-        // FIX: Incorrect endpoint used previously
-        // TAG: 404
-        const response = await axios.get(`${API_BASE_URL}/matches/open`, {
-            params: {
-                type: mode,
-                page: mPage.value
-            }
-        });
+  try {
+    // FIX: Incorrect endpoint used previously
+    // TAG: 404
+    const response = await axios.get(`${API_BASE_URL}/matches/open`, {
+      params: {
+        type: mode,
+        page: mPage.value
+      }
+    });
 
-        const newMatches = response.data.data;
-        openMatches.value = [...openMatches.value, ...newMatches];
-    } finally {
-        mLoading.value = false;
-    }
+    const newMatches = response.data.data;
+    openMatches.value = [...openMatches.value, ...newMatches];
+  } finally {
+    mLoading.value = false;
+  }
 }
 
 const fetchPublicStats = async () => {
-    try {
-        const response = await apiStore.getPublicStats()
-        publicStats.value = response.data
-    } catch (error) {
-        console.error("Failed to fetch public stats", error)
-    }
+  try {
+    const response = await apiStore.getPublicStats()
+    publicStats.value = response.data
+  } catch (error) {
+    console.error("Failed to fetch public stats", error)
+  }
 }
 
 const openStats = async () => {
-    showStatsModal.value = true
-    statsLoading.value = true
-    try {
-        const response = await apiStore.getCurrentUserStats()
-        userStats.value = response.data
-    } catch (error) {
-        console.error("Failed to fetch stats", error)
-    } finally {
-        statsLoading.value = false
-    }
+  showStatsModal.value = true
+  statsLoading.value = true
+  try {
+    const response = await apiStore.getCurrentUserStats()
+    userStats.value = response.data
+  } catch (error) {
+    console.error("Failed to fetch stats", error)
+  } finally {
+    statsLoading.value = false
+  }
 }
 
 const getAvatarUrl = (filename) => {
-    return filename
-        ? `${API_BASE_URL.replace('/api/v1', '').replace('v1/')}/storage/photos_avatars/${filename}`
-        : `${API_BASE_URL.replace('/api/v1', '').replace('v1/')}/storage/photos_avatars/anonymous.png`;
+  return filename
+    ? `${API_BASE_URL.replace('/api/v1', '').replace('v1/')}/storage/photos_avatars/${filename}`
+    : `${API_BASE_URL.replace('/api/v1', '').replace('v1/')}/storage/photos_avatars/anonymous.png`;
 }
 
 const fetchLeaderboard = async () => {
-    if (lbLoading.value || !lbMorePages.value) return;
-    lbLoading.value = true;
-    try {
-        const response = await apiStore.getLeaderboard({ page: lbPage.value });
-        const newEntries = response.data.data;
+  if (lbLoading.value || !lbMorePages.value) return;
+  lbLoading.value = true;
+  try {
+    const response = await apiStore.getLeaderboard({ page: lbPage.value });
+    const newEntries = response.data.data;
 
-        if (newEntries.length < 10) {
-            lbMorePages.value = false;
-        }
-
-        leaderboardEntries.value = [...leaderboardEntries.value, ...newEntries];
-        lbPage.value++;
-    } finally {
-        lbLoading.value = false;
+    if (newEntries.length < 10) {
+      lbMorePages.value = false;
     }
+
+    leaderboardEntries.value = [...leaderboardEntries.value, ...newEntries];
+    lbPage.value++;
+  } finally {
+    lbLoading.value = false;
+  }
 }
 
 const openLeaderboard = async () => {
-    leaderboardEntries.value = [];
-    lbPage.value = 1;
-    showLeaderboardModal.value = true;
-    await nextTick();
-    setupLeaderboardObserver();
-    await fetchLeaderboard();
+  leaderboardEntries.value = [];
+  lbPage.value = 1;
+  showLeaderboardModal.value = true;
+  await nextTick();
+  setupLeaderboardObserver();
+  await fetchLeaderboard();
 }
 
 const setupLeaderboardObserver = () => {
-    if (lbObserver.value) lbObserver.value.disconnect();
-    lbObserver.value = new IntersectionObserver((entries) => {
-        if (entries[0].isIntersecting && !lbLoading.value && leaderboardEntries.value.length > 0) {
-            fetchLeaderboard();
-        }
-    }, { threshold: 0.1 });
-
-    if (lbObserverTarget.value) {
-        lbObserver.value.observe(lbObserverTarget.value);
+  if (lbObserver.value) lbObserver.value.disconnect();
+  lbObserver.value = new IntersectionObserver((entries) => {
+    if (entries[0].isIntersecting && !lbLoading.value && leaderboardEntries.value.length > 0) {
+      fetchLeaderboard();
     }
+  }, { threshold: 0.1 });
+
+  if (lbObserverTarget.value) {
+    lbObserver.value.observe(lbObserverTarget.value);
+  }
 }
 
 const clickMode = async (mode) => {
-    if (selectedMode.value === mode) return;
-    selectedMode.value = mode;
-    openGames.value = [];
-    gPage.value = 1;
-    openMatches.value = [];
-    mPage.value = 1;
-    await Promise.all([getPendingGames(), getPendingMatches()]);
-    setupGamesObserver();
-    setupMatchesObserver();
+  if (selectedMode.value === mode) return;
+  selectedMode.value = mode;
+  openGames.value = [];
+  gPage.value = 1;
+  openMatches.value = [];
+  mPage.value = 1;
+  await Promise.all([getPendingGames(), getPendingMatches()]);
+  setupGamesObserver();
+  setupMatchesObserver();
 }
 
 const startSingle = () => {
-    router.push({ name: 'bisca' + selectedMode.value });
+  router.push({ name: 'bisca' + selectedMode.value });
 }
 
 const toggleReady = () => {
-    isReady.value = !isReady.value
+  isReady.value = !isReady.value
 }
 
 onMounted(async () => {
-    await fetchPublicStats();
-    if (isLoggedIn) {
-        await Promise.all([getPendingGames(), getPendingMatches()]);
-        await nextTick();
-        setupGamesObserver();
-        setupMatchesObserver();
-    }
+  await fetchPublicStats();
+  if (isLoggedIn) {
+    await Promise.all([getPendingGames(), getPendingMatches()]);
+    await nextTick();
+    setupGamesObserver();
+    setupMatchesObserver();
+  }
 })
 
+// Update Host Game to handle Matches
 const hostGame = async () => {
-    showHostModal.value = true
-
-    try {
-        const response = await axios.post(`${API_BASE_URL}/games/host`, {
-            type: selectedMode.value
-        })
-
-        const gameId = response.data.id
-
-        console.log('Game hosted:', gameId)
-
-        router.push({
-            name: 'multiplayer-game',
-            params: { id: gameId },
-            query: { type: selectedMode.value }
-        })
-    } catch (error) {
-        console.error('Failed to host game:', error)
-        console.error('Error details:', error.response?.data)
-        showHostModal.value = false
-        alert('Failed to host game: ' + (error.response?.data?.message || error.message))
+  // 1. Validation
+  if (isBestOfThree.value) {
+    if (wagerAmount.value <= 0) {
+      alert("For a match, the stake must be at least 1 coin.");
+      return;
     }
+    if (wagerAmount.value > userCoins.value) {
+      alert("You don't have enough coins to stake this amount!");
+      return;
+    }
+  }
+
+  hostLoading.value = true; // DISABLE BUTTON
+
+  // 2. Prepare Payload
+  const endpoint = isBestOfThree.value ? '/matches' : '/games/host'
+
+  // Note: Matches use 'stake', Games don't need it.
+  const payload = isBestOfThree.value
+    ? { type: parseInt(selectedMode.value), stake: parseInt(wagerAmount.value) }
+    : { type: parseInt(selectedMode.value) }
+
+  try {
+    const response = await axios.post(`${API_BASE_URL}${endpoint}`, payload)
+
+    const resultId = response.data.match?.id || response.data.id || response.data.data?.id;
+
+    if (!resultId) {
+      throw new Error("Server response missing ID");
+    }
+
+    const routeName = isBestOfThree.value ? 'multiplayer-match' : 'multiplayer-game'
+
+    console.log(`${isBestOfThree.value ? 'Match' : 'Game'} hosted:`, resultId)
+
+    // Close modal immediately
+    showHostModal.value = false;
+
+    router.push({
+      name: routeName,
+      params: { id: resultId },
+      query: { type: selectedMode.value }
+    })
+
+  } catch (error) {
+    console.error('Failed to host:', error);
+
+    // Handle Validation Errors (422)
+    if (error.response?.data?.errors) {
+      const firstError = Object.values(error.response.data.errors)[0][0];
+      alert(`Validation Error: ${firstError}`);
+    }
+    // Handle Logic Errors (e.g., "You already have a match")
+    else if (error.response?.data?.message) {
+      alert(error.response.data.message);
+    }
+    else {
+      alert('Failed to host: ' + error.message);
+    }
+  } finally {
+    hostLoading.value = false; // RE-ENABLE BUTTON
+  }
+}
+
+const joinMatch = async (match) => {
+  selectedGame.value = match // Reusing selectedGame variable for modal context
+
+  // Check balance
+  if (match.wager > userCoins.value) {
+    alert(`Insufficient funds! You need ${match.wager} coins to join this match.`)
+    return
+  }
+
+  if (!confirm(`This match requires a wager of ${match.wager} coins. Do you want to join?`)) {
+    return;
+  }
+
+  try {
+    await axios.post(`${API_BASE_URL}/matches/${match.id}/join`)
+    router.push({
+      name: 'multiplayer-match', // Redirect to Match Interface
+      params: { id: match.id },
+      query: { type: selectedMode.value }
+    })
+  } catch (error) {
+    console.error('Failed to join match:', error)
+    alert(error.response?.data?.message || 'Failed to join match')
+  }
 }
 
 const joinGame = async (game) => {
-    selectedGame.value = game
+  selectedGame.value = game
 
-    try {
-        await axios.post(`${API_BASE_URL}/games/${game.id}/join`)
+  try {
+    await axios.post(`${API_BASE_URL}/games/${game.id}/join`)
 
-        console.log('Joined game:', game.id)
+    console.log('Joined game:', game.id)
 
-        router.push({
-            name: 'multiplayer-game',
-            params: { id: game.id },
-            query: { type: selectedMode.value }
-        })
-    } catch (error) {
-        console.error('Failed to join game:', error)
-        console.error('Error details:', error.response?.data)
-        alert('Failed to join game: ' + (error.response?.data?.message || error.message))
-    }
+    router.push({
+      name: 'multiplayer-game',
+      params: { id: game.id },
+      query: { type: selectedMode.value }
+    })
+  } catch (error) {
+    console.error('Failed to join game:', error)
+    console.error('Error details:', error.response?.data)
+    alert('Failed to join game: ' + (error.response?.data?.message || error.message))
+  }
 }
 
+const openHostModal = (forMatch) => {
+  isBestOfThree.value = forMatch; // Set the toggle automatically
+  showHostModal.value = true;     // Open the modal
+  wagerAmount.value = 0;         // Reset wager amount
+}
+
+watch(() => userLoggedIn, async (isLoggedIn) => {
+  if (isLoggedIn) {
+    await userStore.fetchCoins()
+    userCoins.value = userStore.coins
+  } else {
+    userStore.coins = 0
+  }
+}, { immediate: true })
+
 </script>
 
 <template>
-    <div class="min-h-screen bg-cover bg-center transition-all duration-700">
+  <div class="min-h-screen bg-cover bg-center transition-all duration-700">
 
-        <div class="flex flex-col justify-center items-center gap-5 pt-10 pb-10 px-4">
+    <div class="flex flex-col justify-center items-center gap-5 pt-10 pb-10 px-4">
 
-            <Card v-if="publicStats" class="w-full max-w-2xl border-[#a855f7] bg-[#f8f0ff] shadow-sm">
-                <CardContent class="p-4">
-                    <div class="flex justify-around items-center">
-                        <div class="text-center">
-                            <p class="text-xs uppercase font-bold opacity-70">Players</p>
-                            <p class="text-xl font-black">{{ publicStats.total_players }}</p>
-                        </div>
-                        <div class="h-8 w-[1px] bg-[#a855f7]/20"></div>
-                        <div class="text-center">
-                            <p class="text-xs uppercase font-bold opacity-70">Total Games</p>
-                            <p class="text-xl font-black">{{ publicStats.total_games }}</p>
-                        </div>
-                        <div class="h-8 w-[1px] bg-[#a855f7]/20"></div>
-                        <div class="text-center">
-                            <p class="text-xs uppercase font-bold opacity-70">Active</p>
-                            <p class="text-xl font-black">{{ publicStats.active_games }}</p>
-                        </div>
-                    </div>
-                </CardContent>
-            </Card>
+      <Card v-if="publicStats" class="w-full max-w-2xl border-[#a855f7] bg-[#f8f0ff] shadow-sm">
+        <CardContent class="p-4">
+          <div class="flex justify-around items-center">
+            <div class="text-center">
+              <p class="text-xs uppercase font-bold opacity-70">Players</p>
+              <p class="text-xl font-black">{{ publicStats.total_players }}</p>
+            </div>
+            <div class="h-8 w-[1px] bg-[#a855f7]/20"></div>
+            <div class="text-center">
+              <p class="text-xs uppercase font-bold opacity-70">Total Games</p>
+              <p class="text-xl font-black">{{ publicStats.total_games }}</p>
+            </div>
+            <div class="h-8 w-[1px] bg-[#a855f7]/20"></div>
+            <div class="text-center">
+              <p class="text-xs uppercase font-bold opacity-70">Active</p>
+              <p class="text-xl font-black">{{ publicStats.active_games }}</p>
+            </div>
+          </div>
+        </CardContent>
+      </Card>
 
-            <div class="relative w-full max-w-md bg-card rounded-lg border shadow-sm overflow-hidden">
-                <div class="relative h-14 flex items-center">
+      <div class="relative w-full max-w-md bg-card rounded-lg border shadow-sm overflow-hidden">
+        <div class="relative h-14 flex items-center">
 
-                    <button @click="clickMode('9')"
-                        class="h-full flex items-center justify-center font-semibold transition-all duration-500 ease-in-out border-r last:border-r-0"
-                        :class="{
-                            'w-2/3 z-10 text-purple-600 dark:text-purple-400 bg-purple-500/10': selectedMode === '9',
-                            'w-1/3 z-0 text-muted-foreground/40 bg-transparent': selectedMode !== '9'
-                        }">
-                        <span>Bisca de 9</span>
-                    </button>
+          <button @click="clickMode('9')"
+            class="h-full flex items-center justify-center font-semibold transition-all duration-500 ease-in-out border-r last:border-r-0"
+            :class="{
+              'w-2/3 z-10 text-purple-600 dark:text-purple-400 bg-purple-500/10': selectedMode === '9',
+              'w-1/3 z-0 text-muted-foreground/40 bg-transparent': selectedMode !== '9'
+            }">
+            <span>Bisca de 9</span>
+          </button>
 
-                    <button @click="clickMode('3')"
-                        class="h-full flex items-center justify-center font-semibold transition-all duration-500 ease-in-out"
-                        :class="{
-                            'w-2/3 z-10 text-purple-600 dark:text-purple-400 bg-purple-500/10': selectedMode === '3',
-                            'w-1/3 z-0 text-muted-foreground/40 bg-transparent': selectedMode !== '3'
-                        }">
-                        <span>Bisca de 3</span>
-                    </button>
+          <button @click="clickMode('3')"
+            class="h-full flex items-center justify-center font-semibold transition-all duration-500 ease-in-out"
+            :class="{
+              'w-2/3 z-10 text-purple-600 dark:text-purple-400 bg-purple-500/10': selectedMode === '3',
+              'w-1/3 z-0 text-muted-foreground/40 bg-transparent': selectedMode !== '3'
+            }">
+            <span>Bisca de 3</span>
+          </button>
 
+        </div>
+      </div>
+
+      <div class="flex flex-col items-center gap-5 w-[100vw]">
+        <Card class="w-full max-w-2xl">
+          <CardHeader>
+            <CardTitle class="text-3xl font-bold text-center">
+              Single Player
+            </CardTitle>
+            <CardDescription class="text-center">
+              Go against one of our bots!
+            </CardDescription>
+          </CardHeader>
+          <CardContent class="space-y-6">
+            <div class="flex justify-center">
+              <Button @click="startSingle()" size="lg" variant="secondary"
+                class="hover:bg-purple-500 hover:text-slate-200">
+                Start Game
+              </Button>
+            </div>
+          </CardContent>
+        </Card>
+        <Card class="w-full max-w-2xl flex flex-col">
+          <CardHeader>
+            <CardTitle class="text-3xl font-bold text-center">Multi Player</CardTitle>
+            <CardDescription class="text-center">Go one on one with another player!</CardDescription>
+          </CardHeader>
+
+          <CardContent class="flex-1 flex flex-col space-y-6">
+            <div class="flex flex-col flex-1">
+              <div class="flex justify-between items-end mb-2">
+                <label class="text-sm font-bold uppercase tracking-wider text-muted-foreground">Open
+                  Matches</label>
+                <Button v-if="isLoggedIn" @click="openHostModal(true)" size="sm" variant="outline"
+                  class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
+                  Host
+                </Button>
+              </div>
+
+              <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
+                <div v-if="openMatches.length === 0" class="p-6 text-center text-sm text-muted-foreground">
+                  No open matches yet. Try hosting one!
                 </div>
+
+                <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
+                  <div v-for="(match, index) in openMatches" :key="match.id" @click="joinMatch(match)"
+                    class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
+                    <div class="flex items-center gap-3">
+                      <div
+                        class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-red-100 text-red-700">
+                        {{ index + 1 }}
+                      </div>
+                      <div>
+                        <div class="font-medium text-sm flex items-center gap-2">
+                          Match #{{ match.id }}
+                          <span
+                            class="flex items-center text-xs bg-yellow-100 text-yellow-700 px-2 py-0.5 rounded-full">
+                            <Coins class="w-3 h-3 mr-1" /> {{ match.wager }}
+                          </span>
+                        </div>
+                        <div class="text-[10px] text-muted-foreground">
+                          Host: {{ match.host?.nickname || 'Waiting...' }}
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div ref="mObserverTarget" class="h-10 flex items-center justify-center">
+                    <span v-if="mLoading" class="text-xs text-purple-500 animate-pulse">Loading matches...</span>
+                  </div>
+                </div>
+              </div>
             </div>
 
-            <div class="flex flex-col items-center gap-5 w-[100vw]">
-                <Card class="w-full max-w-2xl">
-                    <CardHeader>
-                        <CardTitle class="text-3xl font-bold text-center">
-                            Single Player
-                        </CardTitle>
-                        <CardDescription class="text-center">
-                            Go against one of our bots!
-                        </CardDescription>
-                    </CardHeader>
-                    <CardContent class="space-y-6">
-                        <div class="flex justify-center">
-                            <Button @click="startSingle()" size="lg" variant="secondary"
-                                class="hover:bg-purple-500 hover:text-slate-200">
-                                Start Game
-                            </Button>
-                        </div>
-                    </CardContent>
-                </Card>
-                <Card class="w-full max-w-2xl flex flex-col">
-                    <CardHeader>
-                        <CardTitle class="text-3xl font-bold text-center">Multi Player</CardTitle>
-                        <CardDescription class="text-center">Go one on one with another player!</CardDescription>
-                    </CardHeader>
+            <div class="flex flex-col flex-1">
+              <div class="flex justify-between items-end mb-2">
+                <label class="text-sm font-medium uppercase tracking-wider text-muted-foreground">Open
+                  Games</label>
+                <Button v-if="isLoggedIn" @click="openHostModal(false)" size="sm" variant="outline"
+                  class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
+                  Host
+                </Button>
+              </div>
 
-                    <CardContent class="flex-1 flex flex-col space-y-6">
-                        <div class="flex flex-col flex-1">
-                            <div class="flex justify-between items-end mb-2">
-                                <label class="text-sm font-bold uppercase tracking-wider text-muted-foreground">Open
-                                    Matches</label>
-                                <Button v-if="isLoggedIn" @click="showHostModal()" size="sm" variant="outline"
-                                    class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
-                                    Host
-                                </Button>
-                            </div>
-
-                            <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
-                                <div v-if="openGames.length === 0"
-                                    class="p-6 text-center text-sm text-muted-foreground">
-                                    No open macthes yet. Try hosting one!
-                                </div>
-                                <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
-                                    <div v-for="(match, index) in openMatches" :key="match.id"
-                                        class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
-                                        <div class="flex items-center gap-3">
-                                            <div
-                                                class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-red-100 text-red-700">
-                                                {{ index + 1 }}
-                                            </div>
-                                            <div>
-                                                <div class="font-medium text-sm">Match ID: {{ match.id }}</div>
-                                                <div class="text-[10px] text-muted-foreground">{{ new
-                                                    Date(game.began_at).toLocaleDateString() }} • {{ new
-                                                        Date(game.began_at).toLocaleTimeString([], {
-                                                            hour: '2-digit',
-                                                    minute: '2-digit' }) }}
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div ref="mObserverTarget" class="h-10 flex items-center justify-center">
-                                        <span v-if="mLoading" class="text-xs text-purple-500 animate-pulse">Loading
-                                            matches...</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="flex flex-col flex-1">
-                            <div class="flex justify-between items-end mb-2">
-                                <label class="text-sm font-medium uppercase tracking-wider text-muted-foreground">Open
-                                    Games</label>
-                                <Button v-if="isLoggedIn" @click="hostGame()" size="sm" variant="outline"
-                                    class="border-purple-500 text-purple-500 hover:bg-purple-500 hover:text-white transition-all duration-300 font-bold">
-                                    Host
-                                </Button>
-                            </div>
-
-                            <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
-                                <div v-if="openGames.length === 0"
-                                    class="p-6 text-center text-sm text-muted-foreground">
-                                    No open games yet. Try hosting one!
-                                </div>
-                                <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
-                                    <div v-for="(game, index) in openGames" :key="game.id" @click="joinGame(game)"
-                                        class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
-                                        <div class="flex items-center gap-3">
-                                            <div
-                                                class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-green-100 text-green-700">
-                                                {{ index + 1 }}
-                                            </div>
-                                            <div>
-                                                <div class="font-medium text-sm">Host: {{ game.player1?.nickname ||
-                                                    'Anonymous' }}</div>
-                                                <div class="text-[10px] text-muted-foreground">{{ new
-                                                    Date(game.began_at).toLocaleDateString() }} • {{ new
-                                                        Date(game.began_at).toLocaleTimeString([], {
-                                                            hour: '2-digit',
-                                                    minute: '2-digit' }) }}</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div ref="gObserverTarget" class="h-10 flex items-center justify-center">
-                                        <span v-if="gLoading" class="text-xs text-purple-500 animate-pulse">Loading
-                                            games...</span>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </CardContent>
-                </Card>
+              <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
+                <div v-if="openGames.length === 0" class="p-6 text-center text-sm text-muted-foreground">
+                  No open games yet. Try hosting one!
+                </div>
+                <div v-else class="max-h-[350px] overflow-y-auto custom-scrollbar p-1">
+                  <div v-for="(game, index) in openGames" :key="game.id" @click="joinGame(game)"
+                    class="flex items-center justify-between p-3 mb-2 border border-transparent rounded-lg cursor-pointer transition-all hover:bg-muted/50 hover:border-purple-500">
+                    <div class="flex items-center gap-3">
+                      <div
+                        class="flex h-8 w-8 items-center justify-center rounded-full text-xs font-bold bg-green-100 text-green-700">
+                        {{ index + 1 }}
+                      </div>
+                      <div>
+                        <div class="font-medium text-sm">Host: {{ game.player1?.nickname ||
+                          'Anonymous' }}</div>
+                        <div class="text-[10px] text-muted-foreground">{{ new
+                          Date(game.began_at).toLocaleDateString() }} • {{ new
+                            Date(game.began_at).toLocaleTimeString([], {
+                              hour: '2-digit',
+                              minute: '2-digit'
+                            }) }}</div>
+                      </div>
+                    </div>
+                  </div>
+                  <div ref="gObserverTarget" class="h-10 flex items-center justify-center">
+                    <span v-if="gLoading" class="text-xs text-purple-500 animate-pulse">Loading
+                      games...</span>
+                  </div>
+                </div>
+              </div>
             </div>
-        </div>
-        <div v-if="showHostModal"
-            class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm">
-            <Card class="w-full max-w-sm border-purple-500 shadow-2xl">
-                <CardHeader>
-                    <CardTitle class="text-center">Hosting Game</CardTitle>
-                </CardHeader>
-                <CardContent class="flex flex-col items-center gap-6 py-10">
-                    <div class="relative">
-                        <div
-                            class="h-16 w-16 animate-spin rounded-full border-4 border-purple-500 border-t-transparent">
-                        </div>
-                    </div>
-                    <p class="animate-pulse text-lg font-medium text-muted-foreground">Waiting for opponents...</p>
-                    <Button variant="outline" @click="showHostModal = false">Cancel Hosting</Button>
-                </CardContent>
-            </Card>
-        </div>
-        <div v-if="showJoinModal"
-            class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm">
-            <Card class="w-full max-w-md border-purple-500 shadow-2xl">
-                <CardHeader>
-                    <CardTitle>Join Game</CardTitle>
-                    <CardDescription v-if="selectedGame">
-                        Hosted by {{ selectedGame.player1?.nickname || 'Anonymous' }}
-                    </CardDescription>
-                </CardHeader>
-
-                <CardContent class="space-y-4">
-                    <div class="rounded-lg bg-muted p-4 text-sm">
-                        <p><strong>Game Type:</strong> Bisca de {{ selectedMode }}</p>
-                        <p><strong>Started at:</strong> {{ selectedGame?.began_at }}</p>
-                    </div>
-
-                    <div v-if="isReady"
-                        class="flex items-center justify-center rounded-md bg-green-500/10 p-3 text-green-600 dark:text-green-400">
-                        <span class="animate-pulse font-semibold">Waiting for the host to start...</span>
-                    </div>
-
-                    <div class="flex gap-3 pt-4">
-                        <Button variant="destructive" class="flex-1" @click="showJoinModal = false">
-                            Leave
-                        </Button>
-
-                        <Button class="flex-1 transition-all duration-300" :variant="isReady ? 'outline' : 'default'"
-                            :class="!isReady ? 'bg-purple-600 hover:bg-purple-700' : ''" @click="toggleReady">
-                            {{ isReady ? 'Cancel Ready' : 'Ready up' }}
-                        </Button>
-                    </div>
-                </CardContent>
-            </Card>
-        </div>
-
-        <div v-if="showStatsModal"
-            class="fixed inset-0 z-[60] flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
-            <Card class="w-full max-w-sm max-h-2/3 border-purple-500 shadow-2xl">
-                <CardHeader class="border-b bg-muted/20">
-                    <div class="flex justify-between items-center">
-                        <CardTitle class="flex items-center gap-2">
-                            <User class="text-yellow-500" /> My Statistics
-                        </CardTitle>
-                        <Button variant="ghost" size="sm" @click="showStatsModal = false">X</Button>
-                    </div>
-                </CardHeader>
-
-                <CardContent class="py-6">
-                    <div v-if="statsLoading" class="flex flex-col items-center py-10 gap-4">
-                        <div class="h-8 w-8 animate-spin rounded-full border-4 border-purple-500 border-t-transparent">
-                        </div>
-                        <p class="text-sm text-muted-foreground">Calculating your glory...</p>
-                    </div>
-
-                    <div v-else-if="userStats" class="space-y-6">
-                        <div class="text-center">
-                            <h3 class="text-2xl font-bold text-purple-600">{{ userStats.nickname }}</h3>
-                            <p class="text-sm text-muted-foreground">Performance Overview</p>
-                        </div>
-
-                        <div class="grid grid-cols-2 gap-4">
-                            <div
-                                class="rounded-lg bg-muted/50 p-4 text-center border border-transparent hover:border-purple-500/30 transition-all">
-                                <p class="text-xs uppercase text-muted-foreground font-semibold">Total Games</p>
-                                <p class="text-2xl font-bold">{{ userStats.total_games }}</p>
-                            </div>
-                            <div class="rounded-lg bg-purple-500/10 p-4 text-center border border-purple-500/20">
-                                <p class="text-xs uppercase text-purple-600 font-semibold">Win Rate</p>
-                                <p class="text-2xl font-bold text-purple-600">{{ userStats.win_rate }}</p>
-                            </div>
-                            <div class="rounded-lg bg-green-500/10 p-4 text-center border border-green-500/20">
-                                <p class="text-xs uppercase text-green-600 font-semibold">Wins</p>
-                                <p class="text-2xl font-bold text-green-600">{{ userStats.total_wins }}</p>
-                            </div>
-                            <div class="rounded-lg bg-red-500/10 p-4 text-center border border-red-500/20">
-                                <p class="text-xs uppercase text-red-600 font-semibold">Losses</p>
-                                <p class="text-2xl font-bold text-red-600">{{ userStats.total_losses }}</p>
-                            </div>
-                        </div>
-
-                        <div class="space-y-2">
-                            <div class="flex justify-between text-xs font-medium">
-                                <span>Win/Loss Ratio</span>
-                                <span>{{ userStats.total_wins }}W - {{ userStats.total_losses }}L</span>
-                            </div>
-                            <div class="h-2 w-full bg-red-500/20 rounded-full overflow-hidden flex">
-                                <div class="bg-green-500 h-full" :style="{ width: userStats.win_rate }"></div>
-                            </div>
-                        </div>
-                    </div>
-                </CardContent>
-            </Card>
-        </div>
-
-        <div v-if="showLeaderboardModal"
-            class="fixed inset-0 z-[60] flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
-            <Card class="w-full max-w-lg max-h-1/2 h-[80vh] flex flex-col border-purple-500 shadow-2xl">
-                <CardHeader class="border-b">
-                    <div class="flex justify-between items-center">
-                        <CardTitle class="flex items-center gap-2">
-                            <Trophy class="text-purple-500" /> Leaderboard
-                        </CardTitle>
-                        <Button variant="ghost" size="sm" @click="showLeaderboardModal = false">X</Button>
-                    </div>
-                </CardHeader>
-
-                <CardContent class="flex-1 overflow-y-auto custom-scrollbar p-0">
-                    <div v-for="(user, index) in leaderboardEntries" :key="user.id"
-                        class="flex items-center justify-between p-4 border-b last:border-0 hover:bg-muted/30 transition-colors">
-
-                        <div class="flex items-center gap-4">
-                            <span class="font-bold text-muted-foreground w-6 text-center"
-                                :class="{ 'text-yellow-500': index === 0, 'text-slate-400': index === 1, 'text-orange-400': index === 2 }">
-                                #{{ index + 1 }}
-                            </span>
-                            <img :src="getAvatarUrl(user.photo_avatar_filename)"
-                                class="h-10 w-10 rounded-full border border-purple-200 object-cover" alt="Avatar" />
-                            <div>
-                                <p class="font-semibold text-sm">{{ user.nickname }}</p>
-                                <p class="text-[10px] text-muted-foreground uppercase tracking-wider">Player</p>
-                            </div>
-                        </div>
-
-                        <div class="text-right">
-                            <p class="text-lg font-bold text-purple-600">{{ user.won_games_count }}</p>
-                            <p class="text-[10px] text-muted-foreground uppercase">Wins</p>
-                        </div>
-                    </div>
-
-                    <div ref="lbObserverTarget" class="h-20 flex items-center justify-center">
-                        <span v-if="lbLoading" class="text-purple-500 animate-bounce">Loading rankings...</span>
-                    </div>
-                </CardContent>
-            </Card>
-        </div>
+          </CardContent>
+        </Card>
+      </div>
     </div>
 
-    <div class="fixed right-4 top-1/2 -translate-y-1/2 flex flex-col gap-4 z-40">
-        <Button @click="openLeaderboard" variant="outline" size="icon"
-            class="h-12 w-12 rounded-full shadow-lg border-purple-500 bg-card hover:bg-purple-500 hover:text-white transition-all">
-            <Trophy class="h-6 w-6" />
-        </Button>
-        <Button v-if="useAuthStore().isLoggedIn" @click="openStats" variant="outline" size="icon"
-            class="h-12 w-12 rounded-full shadow-lg border-purple-500 bg-card hover:bg-purple-500 hover:text-white transition-all">
-            <User class="h-6 w-6" />
-        </Button>
+    <div v-if="showHostModal" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 backdrop-blur-sm">
+      <Card class="w-full max-w-sm border-purple-500 shadow-2xl">
+        <CardHeader>
+          <CardTitle class="text-center">
+            {{ isBestOfThree ? 'Host a (Best of 3)' : 'Host Single Game' }}
+          </CardTitle>
+        </CardHeader>
+        <CardContent class="flex flex-col gap-6 py-4">
+
+          <div v-if="isBestOfThree" class="space-y-2 transition-all">
+            <Label>Wager (Coins)</Label>
+            <div class="relative">
+              <Coins class="absolute left-3 top-2.5 h-4 w-4 text-yellow-500" />
+              <Input v-model="wagerAmount" type="number" min="0" class="pl-9" placeholder="Enter wager amount" />
+            </div>
+            <p class="text-xs text-muted-foreground text-right">
+              Balance: {{ userCoins }}
+            </p>
+            <p class="text-[10px] text-yellow-600 bg-yellow-100 p-2 rounded">
+              ⚠️ Winner takes all. Coins are deducted when you join.
+            </p>
+          </div>
+
+          <div v-else class="text-center text-sm text-muted-foreground">
+            <p>No coins required.</p>
+          </div>
+
+          <div class="text-center text-sm text-muted-foreground">
+            <p>Host a standard game of Bisca de {{ selectedMode }}.</p>
+          </div>
+
+          <div class="flex gap-2">
+            <Button variant="outline" class="flex-1" @click="showHostModal = false" :disabled="hostLoading">
+              Cancel
+            </Button>
+
+            <Button class="flex-1 bg-purple-600 hover:bg-purple-700" @click="hostGame" :disabled="hostLoading">
+              <span v-if="hostLoading" class="animate-pulse">Creating...</span>
+              <span v-else>{{ isBestOfThree ? 'Create Match' : 'Start Game' }}</span>
+            </Button>
+          </div>
+
+        </CardContent>
+      </Card>
     </div>
+
+    <div v-if="showStatsModal"
+      class="fixed inset-0 z-[60] flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
+      <Card class="w-full max-w-sm max-h-2/3 border-purple-500 shadow-2xl">
+        <CardHeader class="border-b bg-muted/20">
+          <div class="flex justify-between items-center">
+            <CardTitle class="flex items-center gap-2">
+              <User class="text-yellow-500" /> My Statistics
+            </CardTitle>
+            <Button variant="ghost" size="sm" @click="showStatsModal = false">X</Button>
+          </div>
+        </CardHeader>
+
+        <CardContent class="py-6">
+          <div v-if="statsLoading" class="flex flex-col items-center py-10 gap-4">
+            <div class="h-8 w-8 animate-spin rounded-full border-4 border-purple-500 border-t-transparent">
+            </div>
+            <p class="text-sm text-muted-foreground">Calculating your glory...</p>
+          </div>
+
+          <div v-else-if="userStats" class="space-y-6">
+            <div class="text-center">
+              <h3 class="text-2xl font-bold text-purple-600">{{ userStats.nickname }}</h3>
+              <p class="text-sm text-muted-foreground">Performance Overview</p>
+            </div>
+
+            <div class="grid grid-cols-2 gap-4">
+              <div
+                class="rounded-lg bg-muted/50 p-4 text-center border border-transparent hover:border-purple-500/30 transition-all">
+                <p class="text-xs uppercase text-muted-foreground font-semibold">Total Games</p>
+                <p class="text-2xl font-bold">{{ userStats.total_games }}</p>
+              </div>
+              <div class="rounded-lg bg-purple-500/10 p-4 text-center border border-purple-500/20">
+                <p class="text-xs uppercase text-purple-600 font-semibold">Win Rate</p>
+                <p class="text-2xl font-bold text-purple-600">{{ userStats.win_rate }}</p>
+              </div>
+              <div class="rounded-lg bg-green-500/10 p-4 text-center border border-green-500/20">
+                <p class="text-xs uppercase text-green-600 font-semibold">Wins</p>
+                <p class="text-2xl font-bold text-green-600">{{ userStats.total_wins }}</p>
+              </div>
+              <div class="rounded-lg bg-red-500/10 p-4 text-center border border-red-500/20">
+                <p class="text-xs uppercase text-red-600 font-semibold">Losses</p>
+                <p class="text-2xl font-bold text-red-600">{{ userStats.total_losses }}</p>
+              </div>
+            </div>
+
+            <div class="space-y-2">
+              <div class="flex justify-between text-xs font-medium">
+                <span>Win/Loss Ratio</span>
+                <span>{{ userStats.total_wins }}W - {{ userStats.total_losses }}L</span>
+              </div>
+              <div class="h-2 w-full bg-red-500/20 rounded-full overflow-hidden flex">
+                <div class="bg-green-500 h-full" :style="{ width: userStats.win_rate }"></div>
+              </div>
+            </div>
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+
+    <div v-if="showLeaderboardModal"
+      class="fixed inset-0 z-[60] flex items-center justify-center bg-black/60 backdrop-blur-sm p-4">
+      <Card class="w-full max-w-lg max-h-1/2 h-[80vh] flex flex-col border-purple-500 shadow-2xl">
+        <CardHeader class="border-b">
+          <div class="flex justify-between items-center">
+            <CardTitle class="flex items-center gap-2">
+              <Trophy class="text-purple-500" /> Leaderboard
+            </CardTitle>
+            <Button variant="ghost" size="sm" @click="showLeaderboardModal = false">X</Button>
+          </div>
+        </CardHeader>
+
+        <CardContent class="flex-1 overflow-y-auto custom-scrollbar p-0">
+          <div v-for="(user, index) in leaderboardEntries" :key="user.id"
+            class="flex items-center justify-between p-4 border-b last:border-0 hover:bg-muted/30 transition-colors">
+
+            <div class="flex items-center gap-4">
+              <span class="font-bold text-muted-foreground w-6 text-center"
+                :class="{ 'text-yellow-500': index === 0, 'text-slate-400': index === 1, 'text-orange-400': index === 2 }">
+                #{{ index + 1 }}
+              </span>
+              <img :src="getAvatarUrl(user.photo_avatar_filename)"
+                class="h-10 w-10 rounded-full border border-purple-200 object-cover" alt="Avatar" />
+              <div>
+                <p class="font-semibold text-sm">{{ user.nickname }}</p>
+                <p class="text-[10px] text-muted-foreground uppercase tracking-wider">Player</p>
+              </div>
+            </div>
+
+            <div class="text-right">
+              <p class="text-lg font-bold text-purple-600">{{ user.won_games_count }}</p>
+              <p class="text-[10px] text-muted-foreground uppercase">Wins</p>
+            </div>
+          </div>
+
+          <div ref="lbObserverTarget" class="h-20 flex items-center justify-center">
+            <span v-if="lbLoading" class="text-purple-500 animate-bounce">Loading rankings...</span>
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  </div>
+
+  <div class="fixed right-4 top-1/2 -translate-y-1/2 flex flex-col gap-4 z-40">
+    <Button @click="openLeaderboard" variant="outline" size="icon"
+      class="h-12 w-12 rounded-full shadow-lg border-purple-500 bg-card hover:bg-purple-500 hover:text-white transition-all">
+      <Trophy class="h-6 w-6" />
+    </Button>
+    <Button v-if="useAuthStore().isLoggedIn" @click="openStats" variant="outline" size="icon"
+      class="h-12 w-12 rounded-full shadow-lg border-purple-500 bg-card hover:bg-purple-500 hover:text-white transition-all">
+      <User class="h-6 w-6" />
+    </Button>
+  </div>
 </template>
diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
index b2c0293..efc2070 100644
--- a/frontend/src/router/index.js
+++ b/frontend/src/router/index.js
@@ -10,6 +10,7 @@ import TestAllAnimations from '@/pages/TestAllAnimations.vue'
 import TestGameBoard from '@/pages/TestGameBoard.vue'
 import SinglePlayerGamePage from '@/pages/game/SinglePlayerGamePage.vue'
 import MultiplayerGamePage from '@/pages/game/MultiplayerGamePage.vue'
+import MultiplayerMatchPage from '@/pages/game/MultiplayerMatchPage.vue'
 import RegisterPage from '@/pages/register/RegisterPage.vue'
 import CoinsPurchasePage from '@/pages/purchase/CoinPurchasePage.vue'
 import { useAuthStore } from '@/stores/auth'
@@ -54,6 +55,12 @@ const router = createRouter({
       component: MultiplayerGamePage,
       meta: { requiresAuth: true }
     },
+    {
+      path: '/match/:id',
+      name: 'multiplayer-match',
+      component: MultiplayerMatchPage,
+      meta: { requiresAuth: true }
+    },
     {
       path: '/user',
       component: UserPage,
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..c93be32
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+  "name": "DADProject",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {}
+}