Clean Production Release

.gitattributes

@@ -0,0 +1,2 @@
+*.xlsx filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text

.github/workflows/keep_alive.yml

@@ -0,0 +1,22 @@
+name: Keep App Alive
+
+on:
+  schedule:
+    - cron: '0 */8 * * *'
+  workflow_dispatch: 
+
+jobs:
+  ping-repo:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write  # Critical: Grants the action permission to push to your repo
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Push Empty Commit
+        run: |
+          git config --global user.name "GitHub Actions"
+          git config --global user.email "actions@github.com"
+          git commit --allow-empty -m "Auto-commit to keep app awake"
+          git push

.github/workflows/sync.yml

@@ -0,0 +1,17 @@
+name: Sync to Hugging Face
+on:
+  push:
+    branches: [main, master]
+jobs:
+  sync-to-hub:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          lfs: true
+      - name: Push to Hugging Face
+        env:
+          HF_TOKEN: ${{ secrets.HF_TOKEN }}
+        # BE SURE TO REPLACE THE TWO PLACEHOLDERS BELOW!
+        run: git push --force https://AnayShukla:${HF_TOKEN}@huggingface.co/spaces/AnayShukla/fpl-solver HEAD:main

.gitignore

@@ -0,0 +1,48 @@
+*
+
+!fpl_streamlit_app.py
+!statistical_weighted_baselines.csv
+!statistical_weighted_baselines_gk.csv
+!admin_persistent_xmins_overrides.json
+!admin_persistent_share_overrides.json
+!admin_persistent_availability_multipliers.json
+!ewmapois_model.csv
+!team_totals.xlsx
+!user_xmins_overrides.json
+!user_player_status_overrides.json
+!user_baseline_overrides.json
+!player_penalty_shares.json
+!player_groups.json
+!rename.json
+!rates_config.json
+!requirements.txt
+!README.md
+!.gitignore
+!.github
+!.github/workflows
+!.github/workflows/*
+!projections_check.xlsx
+!points_check.xlsx
+!logos/
+!logos/*
+!team_ratings_dual_speed.csv
+!frontend/*
+!frontend
+!frontend/src
+!frontend/src/*
+!frontend/src/*/*
+!frontend/public
+!frontend/public/*
+!main.py
+!engine.py
+!database.py
+!fpl_api.py
+!auth.py
+!solver.py
+!solver_engine.py
+!admin_fixture_overrides.json
+!Dockerfile
+!.gitattributes
+
+
+!LICENSE

Dockerfile

@@ -0,0 +1,18 @@
+# Use a lightweight Python x86 image
+FROM python:3.10-slim
+
+# Set the working directory inside the server
+WORKDIR /app
+
+# Copy your requirements first and install them
+COPY requirements.txt .
+RUN pip install --no-cache-dir -r requirements.txt
+
+# Copy all your Python code, CSVs, and logic into the server
+COPY . .
+
+# Hugging Face REQUIRES your app to run on port 7860
+EXPOSE 7860
+
+# The command to boot the server
+CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "7860"]

README.md

@@ -0,0 +1,23 @@
+---
+title: Luigi's Mansion FPL Solver
+emoji: 👻
+colorFrom: green
+colorTo: purple
+sdk: docker
+app_port: 7860
+---
+
+
+
+## Luigi's Mansion
+Yes you can play around with xMins here (I made it more for my convenience rather than yours but nonetheless, enjoy!)
+Luigi attempts a thing! I have finally managed to make my very own player model, think it might be subpar to the great ones but it's a start at least and I am relatively happy with that. Hope you all have a fun time tinkering!
+
+### Instructions:
+
+- Use the sidebar to adjust player minutes, weekly or across the horizon.
+- Please wait 1-2s after pressing the Update button as your changes get processed and updated.
+- Currently, the overrides CANNOT be applied simultaneously, so don't forget to press the Update button else your changes will not be processed.
+- The Reset Override button ONLY resets the xMins of the player chosen. To revert back to original projections, simply reload the page.
+- The CSV is compatible with Sertalp + Moose's Solver, you can either rename the file to 'fplreview' or set 'luigis_mansion' as the datasource in the settings json.
+- You can download your customized projections as a CSV file (will be downloaded as 'luigis_mansion.csv').

admin_fixture_overrides.json

@@ -0,0 +1,11 @@
+{
+    "3_vs_13": {
+        "33": 1
+    },
+    "6_vs_7": {
+        "33": 1
+    },
+    "4_vs_11": {
+        "33": 1
+    }
+}

admin_persistent_availability_multipliers.json

@@ -0,0 +1,555 @@
+{
+    "17": {
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.0,
+        "11": 0.0,
+        "12": 0.5
+    },
+    "173": {
+        "27": 0.5
+    },
+    "642": {
+        "8": 0.75,
+        "28": 0.0
+    },
+    "200": {
+        "8": 0.75
+    },
+    "596": {
+        "31": 0.6
+    },
+    "217": {
+        "8": 0.75
+    },
+    "237": {
+        "8": 0.75
+    },
+    "525": {
+        "8": 0.75
+    },
+    "316": {
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.0,
+        "11": 0.0,
+        "12": 0.0,
+        "13": 0.0,
+        "14": 0.0,
+        "15": 0.25
+    },
+    "30": {
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.0,
+        "11": 0.25,
+        "12": 0.5,
+        "13": 0.75,
+        "28": 0.6,
+        "29": 0.8
+    },
+    "31": {
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.0,
+        "11": 0.0,
+        "12": 0.0,
+        "13": 0.0,
+        "14": 0.0,
+        "15": 0.0,
+        "16": 0.0,
+        "17": 0.0,
+        "19": 1.0
+    },
+    "151": {
+        "4": 0.75
+    },
+    "232": {
+        "8": 0.75
+    },
+    "230": {
+        "28": 0.0
+    },
+    "135": {
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.5
+    },
+    "402": {
+        "8": 0.25,
+        "9": 0.5
+    },
+    "419": {
+        "17": 0.25,
+        "18": 1.0
+    },
+    "411": {
+        "29": 0.7
+    },
+    "235": {
+        "4": 0.5,
+        "6": 0.0,
+        "7": 0.0,
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.0,
+        "11": 0.25,
+        "12": 0.5,
+        "22": 0.93
+    },
+    "64": {
+        "24": 0.4
+    },
+    "712": {
+        "4": 0.75,
+        "6": 0.75
+    },
+    "293": {
+        "27": 0.0
+    },
+    "403": {
+        "4": 0.5,
+        "5": 1.0
+    },
+    "450": {
+        "4": 0.75,
+        "13": 0.0,
+        "14": 0.75
+    },
+    "508": {
+        "25": 0.0
+    },
+    "490": {
+        "4": 0.5
+    },
+    "654": {
+        "4": 0.75,
+        "5": 0.75
+    },
+    "299": {
+        "4": 0.5,
+        "23": 0.9
+    },
+    "48": {
+        "6": 0.5,
+        "5": 0.5,
+        "7": 0.0,
+        "8": 0.0,
+        "9": 0.25,
+        "10": 0.5,
+        "11": 0.5,
+        "12": 1.0
+    },
+    "488": {
+        "23": 0.8
+    },
+    "685": {
+        "5": 0.75
+    },
+    "85": {
+        "31": 0.0
+    },
+    "145": {
+        "5": 0.75
+    },
+    "506": {
+        "5": 0.5,
+        "6": 0.25,
+        "7": 0.5,
+        "13": 0.75
+    },
+    "552": {
+        "5": 0.75
+    },
+    "547": {
+        "31": 0.7
+    },
+    "16": {
+        "25": 0.0,
+        "26": 0.0
+    },
+    "457": {
+        "17": 0.0
+    },
+    "249": {
+        "6": 0.75
+    },
+    "32": {
+        "7": 0.25
+    },
+    "40": {
+        "8": 0.75,
+        "7": 0.0
+    },
+    "152": {
+        "7": 0.5
+    },
+    "157": {
+        "7": 0.25,
+        "8": 0.75,
+        "10": 0.75,
+        "9": 0.5,
+        "11": 0.0,
+        "12": 0.0,
+        "13": 0.25,
+        "14": 0.0,
+        "15": 0.5,
+        "16": 0.75,
+        "19": 0.5,
+        "31": 0.9
+    },
+    "226": {
+        "7": 0.0,
+        "14": 0.25
+    },
+    "242": {
+        "7": 0.0,
+        "23": 0.8
+    },
+    "337": {
+        "30": 0.5
+    },
+    "332": {
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.5
+    },
+    "338": {
+        "8": 0.0,
+        "9": 0.0,
+        "10": 0.5
+    },
+    "97": {
+        "9": 0.0,
+        "10": 0.5,
+        "11": 1.0
+    },
+    "317": {
+        "9": 0.0,
+        "10": 1.0,
+        "11": 1.0
+    },
+    "329": {
+        "29": 0.65,
+        "30": 0.7
+    },
+    "413": {
+        "9": 0.5,
+        "16": 0.5
+    },
+    "5": {
+        "9": 0.5,
+        "10": 1.0,
+        "12": 0.25,
+        "13": 0.5,
+        "18": 0.25,
+        "19": 0.9
+    },
+    "6": {
+        "10": 0.0,
+        "11": 1.0,
+        "14": 0.0,
+        "15": 0.25,
+        "16": 0.5
+    },
+    "381": {
+        "31": 0.0,
+        "32": 0.8
+    },
+    "382": {
+        "28": 0.45,
+        "29": 0.4,
+        "30": 0.65
+    },
+    "666": {
+        "11": 0.0,
+        "12": 0.5,
+        "13": 0.25,
+        "14": 0.5
+    },
+    "691": {
+        "30": 0.75
+    },
+    "612": {
+        "12": 0.0,
+        "21": 0.0,
+        "22": 0.75
+    },
+    "82": {
+        "13": 1.0,
+        "12": 0.75,
+        "30": 0.8
+    },
+    "476": {
+        "12": 0.0
+    },
+    "375": {
+        "12": 0.0,
+        "13": 0.0,
+        "14": 0.0
+    },
+    "302": {
+        "13": 0.0,
+        "14": 0.0,
+        "15": 0.0,
+        "16": 0.0,
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0
+    },
+    "661": {
+        "13": 0.5,
+        "21": 0.45,
+        "22": 1.0
+    },
+    "515": {
+        "13": 0.75
+    },
+    "565": {
+        "31": 0.0
+    },
+    "569": {
+        "13": 0.0,
+        "18": 0.0,
+        "26": 0.0,
+        "27": 0.0,
+        "28": 0.0,
+        "29": 0.0,
+        "30": 0.0
+    },
+    "72": {
+        "14": 0.0,
+        "16": 0.75
+    },
+    "267": {
+        "14": 0.0,
+        "15": 0.0,
+        "16": 0.75
+    },
+    "241": {
+        "14": 0.0,
+        "15": 0.0,
+        "16": 0.0
+    },
+    "469": {
+        "14": 0.0,
+        "15": 0.0
+    },
+    "660": {
+        "14": 0.0,
+        "15": 0.5,
+        "23": 0.8,
+        "25": 0.0,
+        "26": 0.0
+    },
+    "236": {
+        "25": 0.6,
+        "26": 0.95,
+        "30": 0.0
+    },
+    "554": {
+        "14": 0.0,
+        "15": 0.0
+    },
+    "295": {
+        "15": 0.25,
+        "16": 1.0,
+        "20": 0.75,
+        "22": 0.0,
+        "23": 0.0
+    },
+    "256": {
+        "16": 0.75,
+        "30": 0.8
+    },
+    "257": {
+        "29": 0.0
+    },
+    "384": {
+        "16": 0.0,
+        "17": 0.0,
+        "18": 0.5,
+        "23": 0.8
+    },
+    "8": {
+        "19": 0.75,
+        "30": 0.98
+    },
+    "120": {
+        "16": 0.0,
+        "25": 0.0,
+        "26": 0.0
+    },
+    "365": {
+        "16": 0.0,
+        "17": 0.0
+    },
+    "456": {
+        "17": 0.0
+    },
+    "124": {
+        "17": 0.75
+    },
+    "146": {
+        "17": 0.0
+    },
+    "169": {
+        "17": 0.0
+    },
+    "694": {
+        "28": 0.75
+    },
+    "178": {
+        "17": 0.5
+    },
+    "387": {
+        "18": 0.0,
+        "26": 0.0
+    },
+    "449": {
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.34,
+        "22": 1.0
+    },
+    "20": {
+        "26": 0.6
+    },
+    "347": {
+        "23": 0.9,
+        "31": 0.0
+    },
+    "717": {
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0
+    },
+    "19": {
+        "18": 0.0
+    },
+    "261": {
+        "18": 0.5,
+        "19": 0.36,
+        "20": 0.62
+    },
+    "374": {
+        "18": 0.5
+    },
+    "7": {
+        "20": 0.0,
+        "21": 0.2,
+        "22": 0.6,
+        "23": 0.6
+    },
+    "36": {
+        "31": 0.7
+    },
+    "58": {
+        "19": 0.0
+    },
+    "643": {
+        "19": 0.0,
+        "26": 0.7
+    },
+    "113": {
+        "19": 0.75
+    },
+    "455": {
+        "19": 0.65,
+        "20": 0.6,
+        "21": 0.5
+    },
+    "21": {
+        "20": 0.0,
+        "21": 1.0,
+        "29": 0.7
+    },
+    "354": {
+        "20": 0.0
+    },
+    "670": {
+        "29": 0.0,
+        "30": 0.0
+    },
+    "673": {
+        "30": 0.0
+    },
+    "796": {
+        "30": 0.7
+    },
+    "531": {
+        "20": 0.46,
+        "31": 0.8
+    },
+    "220": {
+        "21": 0.6
+    },
+    "322": {
+        "21": 0.23,
+        "22": 0.6,
+        "24": 0.8,
+        "25": 0.9,
+        "31": 0.75
+    },
+    "342": {
+        "21": 0.35
+    },
+    "224": {
+        "21": 0.33,
+        "27": 0.0,
+        "28": 0.3,
+        "29": 0.5
+    },
+    "582": {
+        "21": 0.3,
+        "22": 0.7
+    },
+    "12": {
+        "22": 0.0
+    },
+    "260": {
+        "22": 0.0
+    },
+    "84": {
+        "23": 0.0,
+        "24": 0.0,
+        "25": 0.0,
+        "28": 0.45,
+        "29": 0.92
+    },
+    "283": {
+        "24": 0.0
+    },
+    "407": {
+        "23": 0.3
+    },
+    "414": {
+        "23": 0.86
+    },
+    "430": {
+        "23": 0.91,
+        "29": 0.8
+    },
+    "108": {
+        "24": 0.75
+    },
+    "121": {
+        "24": 0.75
+    },
+    "290": {
+        "24": 0.3
+    },
+    "575": {
+        "30": 0.0
+    },
+    "709": {
+        "24": 0.5
+    },
+    "807": {
+        "24": 0.5
+    },
+    "609": {
+        "25": 0.0
+    }
+}

admin_persistent_share_overrides.json

@@ -0,0 +1 @@
+{}

admin_persistent_xmins_overrides.json

@@ -0,0 +1,753 @@
+{
+    "1": {
+        "1": 88.19
+    },
+    "33": {
+        "1": 87.36,
+        "7": 88.77
+    },
+    "338": {
+        "30": 72.0
+    },
+    "81": {
+        "1": 22.34
+    },
+    "101": {
+        "1": 87.57
+    },
+    "596": {
+        "1": 33.87
+    },
+    "136": {
+        "1": 82.3
+    },
+    "5": {
+        "1": 76.18
+    },
+    "120": {
+        "1": 53.13
+    },
+    "597": {
+        "1": 73.0
+    },
+    "41": {
+        "2": 82.54,
+        "7": 78.37
+    },
+    "235": {
+        "18": 75.0,
+        "19": 40.0,
+        "20": 74.0
+    },
+    "238": {
+        "3": 56.55,
+        "6_vs_7": 63.0
+    },
+    "16": {
+        "3": 0.0,
+        "7": 78.73,
+        "32": 52.0
+    },
+    "17": {
+        "3": 0.0,
+        "32": 61.0,
+        "33": 64.0
+    },
+    "474": {
+        "3": 65.2
+    },
+    "491": {
+        "3": 28.37
+    },
+    "654": {
+        "3": 55.47
+    },
+    "18": {
+        "3": 78.04,
+        "4": 77.04,
+        "5": 75.53,
+        "25": 85.0,
+        "26": 83.0
+    },
+    "271": {
+        "4": 77.03,
+        "5": 75.09
+    },
+    "341": {
+        "4": 87.0,
+        "5": 86.0
+    },
+    "665": {
+        "4": 0.0,
+        "5": 0.0
+    },
+    "691": {
+        "5": 75.35,
+        "4": 78.54,
+        "6": 67.43
+    },
+    "733": {
+        "4": 0.0
+    },
+    "430": {
+        "30": 74.0
+    },
+    "431": {
+        "4": 86.43
+    },
+    "456": {
+        "6": 42.43,
+        "32": 12.0
+    },
+    "677": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "697": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "83": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "167": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "198": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "207": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "217": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "266": {
+        "8": 80,
+        "9": 79,
+        "10": 78,
+        "11": 75,
+        "12": 73,
+        "32": 34.0
+    },
+    "267": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "268": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "318": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "324": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "727": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "381": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "402": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "3_vs_13": 34.0
+    },
+    "413": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "119": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "438": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "452": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "299": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0,
+        "32": 76.0
+    },
+    "302": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "521": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "541": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "32": 83.0
+    },
+    "543": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "544": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "552": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "553": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "678": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "735": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "603": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0,
+        "22": 0.0
+    },
+    "631": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "648": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "695": {
+        "17": 0.0,
+        "18": 0.0,
+        "19": 0.0,
+        "20": 0.0,
+        "21": 0.0
+    },
+    "568": {
+        "6": 72.35
+    },
+    "407": {
+        "6": 63.56
+    },
+    "411": {
+        "24": 72.0,
+        "30": 42.0
+    },
+    "367": {
+        "7": 88.42,
+        "8": 88.42,
+        "9": 88.42,
+        "10": 88.42,
+        "11": 88.42,
+        "12": 88.0,
+        "32": 90.0,
+        "33": 90.0,
+        "34": 90.0,
+        "35": 90.0,
+        "36": 90.0,
+        "37": 9.0
+    },
+    "100": {
+        "9": 71.0,
+        "10": 64.0,
+        "32": 49.0,
+        "4_vs_11": 59.0
+    },
+    "252": {
+        "9": 48.0
+    },
+    "22": {
+        "11": 82.0,
+        "13": 83.0
+    },
+    "10": {
+        "16": 81.0
+    },
+    "570": {
+        "13": 84.0,
+        "24": 81.0,
+        "30": 88.0
+    },
+    "572": {
+        "30": 84.0
+    },
+    "567": {
+        "31": 90.0
+    },
+    "573": {
+        "30": 84.0
+    },
+    "725": {
+        "14": 86.0,
+        "15": 84.0,
+        "16": 85.0,
+        "17": 82.0,
+        "18": 67.0,
+        "19": 77.0,
+        "20": 80.0,
+        "21": 78.0,
+        "22": 75.0
+    },
+    "662": {
+        "14": 84.0
+    },
+    "721": {
+        "14": 86.0
+    },
+    "674": {
+        "14": 84.0,
+        "15": 84.0,
+        "17": 88.0,
+        "18": 85.0
+    },
+    "7": {
+        "16": 0.0
+    },
+    "263": {
+        "16": 87.0,
+        "17": 86.0,
+        "18": 84.0,
+        "19": 82.0,
+        "20": 67.0,
+        "21": 58.0,
+        "22": 65.0
+    },
+    "447": {
+        "16": 74.0,
+        "17": 68.0,
+        "18": 60.0
+    },
+    "11": {
+        "16": 83.0,
+        "32": 58.0
+    },
+    "30": {
+        "18": 0.0,
+        "32": 63.0
+    },
+    "295": {
+        "20": 47.0,
+        "21": 88.0,
+        "24": 85.0
+    },
+    "719": {
+        "20": 85.0,
+        "21": 83.0,
+        "22": 80.0
+    },
+    "321": {
+        "21": 87.0,
+        "22": 85.0
+    },
+    "319": {
+        "21": 77.0,
+        "22": 76.0
+    },
+    "405": {
+        "21": 76.0,
+        "22": 75.0
+    },
+    "406": {
+        "21": 78.0,
+        "22": 77.0,
+        "23": 76.0,
+        "24": 75.0,
+        "32": 68.0,
+        "13_vs_1": 69.0,
+        "3_vs_13": 21.0
+    },
+    "808": {
+        "24": 75.0
+    },
+    "113": {
+        "24": 80.0
+    },
+    "712": {
+        "24": 79.0
+    },
+    "273": {
+        "24": 0.0
+    },
+    "814": {
+        "25": 52.0
+    },
+    "400": {
+        "26": 90.0,
+        "27": 90.0,
+        "28": 90.0
+    },
+    "723": {
+        "26": 85.0,
+        "27": 85.0
+    },
+    "812": {
+        "29": 90.0,
+        "30": 90.0
+    },
+    "20": {
+        "32": 52.0
+    },
+    "48": {
+        "32": 26.0,
+        "33": 44.0
+    },
+    "143": {
+        "32": 71.0,
+        "35": 24.0,
+        "18_vs_6": 75.0,
+        "6_vs_7": 1.0
+    },
+    "146": {
+        "32": 0.0,
+        "18_vs_6": 7.0
+    },
+    "160": {
+        "32": 62.0,
+        "6_vs_7": 71.0
+    },
+    "163": {
+        "32": 5.0,
+        "18_vs_6": 4.0
+    },
+    "157": {
+        "32": 84.0,
+        "18_vs_6": 84.0,
+        "6_vs_7": 75.0
+    },
+    "173": {
+        "32": 82.0,
+        "6_vs_7": 82.0
+    },
+    "178": {
+        "32": 77.0,
+        "6_vs_7": 65.0,
+        "18_vs_6": 78.0
+    },
+    "85": {
+        "32": 0.0
+    },
+    "109": {
+        "32": 0.0,
+        "33": 0.0
+    },
+    "231": {
+        "32": 32.0
+    },
+    "232": {
+        "32": 67.0,
+        "6_vs_7": 47.0
+    },
+    "237": {
+        "32": 0.0,
+        "7_vs_14": 51.0
+    },
+    "672": {
+        "32": 68.0
+    },
+    "224": {
+        "32": 35.0,
+        "6_vs_7": 64.0,
+        "7_vs_14": 79.0
+    },
+    "342": {
+        "32": 74.0,
+        "4_vs_11": 47.0
+    },
+    "348": {
+        "32": 68.0
+    },
+    "356": {
+        "32": 73.0
+    },
+    "660": {
+        "32": 0.0,
+        "11_vs_20": 0.0,
+        "4_vs_11": 0.0,
+        "35": 70.0
+    },
+    "366": {
+        "32": 0.0,
+        "33": 0.0,
+        "34": 0.0,
+        "35": 0.0,
+        "36": 0.0,
+        "37": 81.0
+    },
+    "442": {
+        "32": 0.0
+    },
+    "475": {
+        "32": 0.0,
+        "33": 0.0,
+        "34": 0.0,
+        "35": 0.0,
+        "36": 0.0,
+        "37": 20.0
+    },
+    "488": {
+        "32": 0.0
+    },
+    "497": {
+        "32": 0.0
+    },
+    "531": {
+        "32": 53.0
+    },
+    "326": {
+        "32": 70.0
+    },
+    "609": {
+        "32": 0.0
+    },
+    "615": {
+        "32": 60.0,
+        "33": 71.0,
+        "34": 75.0
+    },
+    "606": {
+        "32": 26.0
+    },
+    "791": {
+        "32": 80.0
+    },
+    "21": {
+        "32": 84.0
+    },
+    "8": {
+        "32": 54.0
+    },
+    "152": {
+        "35": 30.0
+    },
+    "169": {
+        "32": 72.0,
+        "18_vs_6": 10.0
+    },
+    "110": {
+        "32": 81.0
+    },
+    "116": {
+        "32": 63.0
+    },
+    "220": {
+        "36": 82.0,
+        "37": 80.0,
+        "38": 78.0
+    },
+    "228": {
+        "32": 71.0,
+        "7_vs_14": 75.0,
+        "6_vs_7": 68.0
+    },
+    "230": {
+        "32": 78.0,
+        "7_vs_14": 77.0,
+        "6_vs_7": 69.0
+    },
+    "347": {
+        "32": 78.0,
+        "11_vs_20": 88.0,
+        "4_vs_11": 88.0
+    },
+    "350": {
+        "32": 77.0,
+        "11_vs_20": 75.0,
+        "4_vs_11": 73.0
+    },
+    "370": {
+        "32": 47.0
+    },
+    "408": {
+        "32": 0.0,
+        "13_vs_1": 3.0,
+        "3_vs_13": 73.0
+    },
+    "441": {
+        "32": 10.0
+    },
+    "716": {
+        "33": 0.0
+    },
+    "694": {
+        "32": 77.0
+    },
+    "813": {
+        "32": 0.0
+    },
+    "417": {
+        "13_vs_1": 72.0,
+        "3_vs_13": 73.0
+    },
+    "666": {
+        "32": 63.0
+    },
+    "148": {
+        "18_vs_6": 86.0,
+        "6_vs_7": 86.0
+    },
+    "151": {
+        "18_vs_6": 87.0,
+        "6_vs_7": 87.0
+    },
+    "158": {
+        "6_vs_7": 71.0
+    },
+    "783": {
+        "6_vs_7": 85.0
+    },
+    "90": {
+        "4_vs_11": 70.0,
+        "15_vs_4": 72.0
+    },
+    "97": {
+        "4_vs_11": 66.0,
+        "15_vs_4": 79.0
+    },
+    "200": {
+        "16_vs_3": 67.0,
+        "3_vs_13": 61.0
+    },
+    "215": {
+        "3_vs_13": 42.0
+    },
+    "225": {
+        "7_vs_14": 2.0
+    },
+    "226": {
+        "35": 0.0
+    },
+    "236": {
+        "6_vs_7": 47.0
+    },
+    "453": {
+        "6_vs_7": 76.0
+    },
+    "365": {
+        "11_vs_20": 18.0,
+        "4_vs_11": 27.0
+    }
+}

auth.py

@@ -0,0 +1,205 @@
+from fastapi import APIRouter, Depends, HTTPException, status
+from sqlalchemy.orm import Session
+from pydantic import BaseModel
+import bcrypt
+from jose import jwt
+from datetime import datetime, timedelta
+from google.oauth2 import id_token
+from google.auth.transport import requests
+from sqlalchemy.orm.attributes import flag_modified
+from database import User, get_db
+from fastapi.security import OAuth2PasswordBearer
+
+oauth2_scheme = OAuth2PasswordBearer(tokenUrl="api/auth/login")
+
+router = APIRouter(prefix="/api/auth", tags=["auth"])
+
+# --- SECURITY CONFIG ---
+SECRET_KEY = "super_secret_luigi_key_change_this_later_in_production"
+ALGORITHM = "HS256"
+# You will get this ID from Google Cloud Console later
+GOOGLE_CLIENT_ID = (
+    "525088967752-vhdm44u6qddh5ldot4p1hibe1k0f7mk2.apps.googleusercontent.com"
+)
+
+
+# --- PYDANTIC MODELS (Payloads) ---
+class UserCreate(BaseModel):
+    email: str
+    password: str
+
+
+class UserLogin(BaseModel):
+    email: str
+    password: str
+
+
+class GoogleLogin(BaseModel):
+    token: str
+
+
+# --- HELPER FUNCTIONS ---
+def create_access_token(data: dict):
+    to_encode = data.copy()
+    expire = datetime.utcnow() + timedelta(days=7)  # Stay logged in for 7 days
+    to_encode.update({"exp": expire})
+    return jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
+
+
+def check_admin_status(email: str):
+    """The magic function that makes you God"""
+    if email.lower() == "anayshukla11@gmail.com":
+        return True
+    return False
+
+
+# --- ROUTES ---
+
+
+@router.post("/register")
+def register_user(user: UserCreate, db: Session = Depends(get_db)):
+    # 1. Check if email exists
+    db_user = db.query(User).filter(User.email == user.email).first()
+    if db_user:
+        raise HTTPException(status_code=400, detail="Email already registered")
+
+    # 2. Hash password directly with bcrypt
+    salt = bcrypt.gensalt()
+    hashed_pw = bcrypt.hashpw(user.password.encode("utf-8"), salt).decode("utf-8")
+
+    # 3. Check if it is the admin email
+    is_admin = check_admin_status(user.email)
+
+    # 4. Save to DB
+    new_user = User(email=user.email, hashed_password=hashed_pw, is_admin=is_admin)
+    db.add(new_user)
+    db.commit()
+    db.refresh(new_user)
+
+    # 5. Issue Token
+    token = create_access_token(
+        {"sub": new_user.email, "role": "admin" if is_admin else "user"}
+    )
+    return {
+        "access_token": token,
+        "token_type": "bearer",
+        "email": new_user.email,
+        "is_admin": is_admin,
+    }
+
+
+@router.post("/login")
+def login_user(user: UserLogin, db: Session = Depends(get_db)):
+    # 1. Fetch user
+    db_user = db.query(User).filter(User.email == user.email).first()
+    if not db_user or not db_user.hashed_password:
+        raise HTTPException(status_code=401, detail="Invalid credentials")
+
+    # 2. Verify password directly with bcrypt
+    if not bcrypt.checkpw(
+        user.password.encode("utf-8"), db_user.hashed_password.encode("utf-8")
+    ):
+        raise HTTPException(status_code=401, detail="Invalid credentials")
+
+    # 3. Issue Token
+    token = create_access_token(
+        {"sub": db_user.email, "role": "admin" if db_user.is_admin else "user"}
+    )
+    return {
+        "access_token": token,
+        "token_type": "bearer",
+        "email": db_user.email,
+        "is_admin": db_user.is_admin,
+    }
+
+
+@router.post("/google")
+def google_auth(payload: GoogleLogin, db: Session = Depends(get_db)):
+    try:
+        # Verify the token Google's frontend sent us
+        # THE FIX: Added clock_skew_in_seconds=10 to forgive slight time differences!
+        idinfo = id_token.verify_oauth2_token(
+            payload.token,
+            requests.Request(),
+            GOOGLE_CLIENT_ID,
+            clock_skew_in_seconds=10,
+        )
+        email = idinfo["email"]
+
+        # Check if user exists
+        db_user = db.query(User).filter(User.email == email).first()
+
+        # If they don't exist, register them silently via Google
+        if not db_user:
+            is_admin = check_admin_status(email)
+            db_user = User(
+                email=email, is_admin=is_admin
+            )  # No password needed for Google auth
+            db.add(db_user)
+            db.commit()
+            db.refresh(db_user)
+
+        token = create_access_token(
+            {"sub": db_user.email, "role": "admin" if db_user.is_admin else "user"}
+        )
+        return {
+            "access_token": token,
+            "token_type": "bearer",
+            "email": db_user.email,
+            "is_admin": db_user.is_admin,
+        }
+
+    except ValueError as e:
+        # THIS WILL TELL YOU EXACTLY WHY IT FAILED
+        print(f"GOOGLE AUTH ERROR: {str(e)}")
+        raise HTTPException(status_code=401, detail=f"Google Error: {str(e)}")
+
+
+def get_current_user(
+    token: str = Depends(oauth2_scheme), db: Session = Depends(get_db)
+):
+    try:
+        payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
+        email = payload.get("sub")
+        if email is None:
+            raise HTTPException(status_code=401)
+    except:
+        raise HTTPException(status_code=401)
+
+    user = db.query(User).filter(User.email == email).first()
+    if user is None:
+        raise HTTPException(status_code=401)
+    return user
+
+
+@router.get("/me")
+def get_user_me(current_user: User = Depends(get_current_user)):
+    return {
+        "email": current_user.email,
+        "is_admin": current_user.is_admin,
+        "default_team_id": current_user.default_team_id,
+        "saved_edits": current_user.saved_edits,
+        "drafts": current_user.drafts,  # <-- NEW: Send realities to React
+    }
+
+
+@router.post("/save_session")
+def save_session(
+    payload: dict,
+    current_user: User = Depends(get_current_user),
+    db: Session = Depends(get_db),
+):
+    if "default_team_id" in payload:
+        current_user.default_team_id = payload["default_team_id"]
+
+    if "saved_edits" in payload:
+        current_user.saved_edits = payload["saved_edits"]
+        flag_modified(current_user, "saved_edits")
+
+    # THE FIX: Catch and permanently save the Multiverse array
+    if "drafts" in payload:
+        current_user.drafts = payload["drafts"]
+        flag_modified(current_user, "drafts")
+
+    db.commit()
+    return {"status": "success"}

database.py

@@ -0,0 +1,50 @@
+import os
+from sqlalchemy import create_engine, Column, Integer, String, Boolean, JSON
+from sqlalchemy.orm import sessionmaker, declarative_base
+
+# Paste your Supabase URI here. Replace [YOUR-PASSWORD] with your actual password!
+SUPABASE_URL = "postgresql://postgres.gjbfbkhygtqubvpbquws:Anayshukla11$$@aws-1-ap-south-1.pooler.supabase.com:6543/postgres"
+
+# SQLAlchemy requires the URL to start with 'postgresql://'
+if SUPABASE_URL.startswith("postgres://"):
+    SUPABASE_URL = SUPABASE_URL.replace("postgres://", "postgresql://", 1)
+
+engine = create_engine(SUPABASE_URL, pool_pre_ping=True)
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+Base = declarative_base()
+
+
+# --- THE USER DATABASE MODEL ---
+class User(Base):
+    __tablename__ = "users"
+
+    id = Column(Integer, primary_key=True, index=True)
+    email = Column(String, unique=True, index=True)
+    hashed_password = Column(String, nullable=True)
+    is_admin = Column(Boolean, default=False)
+
+    # User FPL State
+    default_team_id = Column(Integer, nullable=True)
+    saved_edits = Column(JSON, default={})
+    drafts = Column(JSON, default=[])
+    solver_settings = Column(JSON, default={"quick": {}, "advanced": {}})
+
+
+# --- THE NEW JSON VAULT ---
+class GlobalConfig(Base):
+    __tablename__ = "global_config"
+    key = Column(String, primary_key=True, index=True)
+    value = Column(JSON, default={})
+
+
+# Create the tables in the Supabase database
+Base.metadata.create_all(bind=engine)
+
+
+# Dependency to get the DB session in our API routes
+def get_db():
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()

engine.py

@@ -0,0 +1,613 @@
+import pandas as pd
+import numpy as np
+import math
+from scipy.stats import nbinom
+
+
+def poisson_probability_of_conceding_2_or_more_goals(lambd):
+    """Calculates the probability of conceding 2 or more goals using Poisson distribution."""
+    p_0 = math.exp(-lambd)
+    p_1 = lambd * math.exp(-lambd)
+    return 1 - p_0 - p_1
+
+
+def poisson_pmf(k, lambd):
+    """Calculates the Poisson Probability Mass Function P(X=k)."""
+    if k < 0:
+        return 0.0
+    if lambd < 1e-9:  # Treat very small lambda as zero for stability
+        return 1.0 if k == 0 else 0.0
+    return (lambd**k * math.exp(-lambd)) / math.factorial(k)
+
+
+def neg_binom_probability_of_value(expected_mean, value, dispersion=1.0):
+    """
+    Calculates the exact probability (PMF) of getting exactly 'value' events.
+    Used for: Saves, Goals, Assists.
+    """
+    if expected_mean <= 0:
+        return 0.0
+    if dispersion <= 1.0:  # Fallback to Poisson if no dispersion
+        return poisson_pmf(value, expected_mean)
+
+    # Convert Mean + Dispersion to n, p
+    p = 1 / dispersion
+    n = (expected_mean * p) / (1 - p)
+
+    return nbinom.pmf(value, n, p)
+
+
+def neg_binom_probability_at_least(expected_mean, threshold, dispersion=1.0):
+    """
+    Calculates probability of getting 'threshold' OR MORE events.
+    Used for: DefCons (CBIT), Recoveries.
+    """
+    if expected_mean <= 0:
+        return 0.0
+    if dispersion <= 1.0:
+        # Use existing Poisson logic if dispersion is low
+        return 1 - poisson_cdf(threshold - 1, expected_mean)
+
+    p = 1 / dispersion
+    n = (expected_mean * p) / (1 - p)
+
+    # Probability of X >= threshold is (1 - CDF(threshold - 1))
+    return 1 - nbinom.cdf(threshold - 1, n, p)
+
+
+def calculate_expected_conceded_points(lambd):
+    """
+    Calculates the expected fantasy points from goals conceded based on a
+    -1 point penalty for every 2 goals.
+    """
+    total_expected_points = 0
+    max_goals_to_check = 10
+
+    for k in range(max_goals_to_check + 1):
+        prob_k = poisson_pmf(k=k, lambd=lambd)
+        points_for_k_goals = -(k // 2)
+        total_expected_points += prob_k * points_for_k_goals
+
+    return total_expected_points
+
+
+def poisson_cdf(k, lambd):
+    """Calculates the Poisson Cumulative Distribution Function P(X<=k)."""
+    if k < 0:
+        return 0.0
+    if lambd < 1e-9:  # Treat very small lambda as zero for stability
+        return 1.0 if k >= 0 else 0.0
+    return sum(poisson_pmf(i, lambd) for i in range(math.floor(k) + 1))
+
+
+def apply_team_skepticism(df, skepticism_factors):
+    """
+    Applies a skepticism multiplier to a player's base points based on their team.
+    """
+    if not skepticism_factors:
+        return df
+
+    for team_id, multiplier in skepticism_factors.items():
+        players_on_team = df[df["team"] == team_id].index
+        df.loc[players_on_team, "base_pts"] *= multiplier
+
+    return df
+
+
+def calculate_single_match_points(
+    player,
+    match_row,
+    xMins_in_match,
+    points_config,
+    player_penalty_shares,
+    is_gk=False,
+    is_def=False,
+    is_mid=False,
+    is_fwd=False,
+):
+    """
+    Calculates points for a single match given the xMins and match projections.
+    Includes full logic for CBIT, CBITR, Penalty Saves, and dynamic BPS.
+    """
+    if xMins_in_match <= 0:
+        return {"pts": 0.0, "xG": 0.0, "xA": 0.0, "CS": 0.0, "cbit": 0.0, "cbitr": 0.0}
+
+    scaling_factor = xMins_in_match / 90.0
+    player_team_num = player["team"]
+    player_pos = player["element_type"]
+
+    # 1. Identify Home/Away and get Opponent Stats
+    if player_team_num == match_row["home_team_num"]:
+        team_proj_goals = match_row["mc_home_goals_mean"]
+        team_conc_goals = match_row["mc_away_goals_mean"]
+        team_proj_assists = match_row["mc_home_assists_xa_mean"]
+        team_proj_cbit = match_row["mc_home_CBIT_mean"]
+        team_proj_cbitr = match_row["mc_home_CBITR_mean"]
+        team_proj_saves = match_row["mc_home_keeper_saves_mean"]
+        team_proj_yc = match_row["mc_home_yc_mean"]
+        team_proj_rc = match_row["mc_home_rc_mean"]
+        cs_odds = match_row["home_clean_sheet_odds"]
+    else:
+        team_proj_goals = match_row["mc_away_goals_mean"]
+        team_conc_goals = match_row["mc_home_goals_mean"]
+        team_proj_assists = match_row["mc_away_assists_xa_mean"]
+        team_proj_cbit = match_row["mc_away_CBIT_mean"]
+        team_proj_cbitr = match_row["mc_away_CBITR_mean"]
+        team_proj_saves = match_row["mc_away_keeper_saves_mean"]
+        team_proj_yc = match_row["mc_away_yc_mean"]
+        team_proj_rc = match_row["mc_away_rc_mean"]
+        cs_odds = match_row["away_clean_sheet_odds"]
+
+    # 2. Player Share Calculations
+    proj_goals = player["xG_share"] * team_proj_goals
+    proj_assists = player["xA_share"] * team_proj_assists
+    proj_cbit = player["xCBIT_share"] * team_proj_cbit
+    proj_cbitr = player["xCBITR_share"] * team_proj_cbitr
+
+    proj_saves = 0
+    proj_pen_saves = 0
+    if is_gk:
+        proj_saves = (player["baseline_xSaves_p90"] + team_proj_saves) / 2
+        proj_pen_saves = player["baseline_pksave_p90"]
+
+    # --- GOALS & ASSISTS ---
+    pts_goals = (
+        sum(
+            poisson_pmf(k, proj_goals) * k * points_config["goal"][player_pos]
+            for k in range(9)
+        )
+        * scaling_factor
+    )
+    pts_assists = (
+        sum(
+            poisson_pmf(k, proj_assists) * k * points_config["assist"] for k in range(9)
+        )
+        * scaling_factor
+    )
+
+    # --- CLEAN SHEET & CONCEDED ---
+    pts_cs = (
+        cs_odds * points_config["clean_sheet"][player_pos]
+        if xMins_in_match >= 60
+        else (cs_odds * points_config["clean_sheet"][player_pos]) * scaling_factor
+    )
+    pts_conc = (
+        calculate_expected_conceded_points(team_conc_goals) * scaling_factor
+        if (is_gk or is_def) and team_conc_goals is not None
+        else 0.0
+    )
+
+    # --- CARDS ---
+    pts_yc = (player["YC_share"] * team_proj_yc * -1) * scaling_factor
+    pts_rc = (player["RC_share"] * team_proj_rc * -3) * scaling_factor
+
+    # --- SAVES & PENALTY SAVES (GK) ---
+    pts_saves = 0.0
+    pts_pen_save = 0.0
+    if is_gk:
+        expected_saves_pts_unscaled = sum(
+            neg_binom_probability_of_value(proj_saves, k, dispersion=1.5)
+            * ((k // 3) * points_config["saves_per_3"])
+            for k in range(21)
+        )
+        pts_saves = expected_saves_pts_unscaled * scaling_factor
+        expected_pen_saved_pts_unscaled = sum(
+            poisson_pmf(k, proj_pen_saves) * (k * 5) for k in range(3)
+        )
+        pts_pen_save = expected_pen_saved_pts_unscaled * scaling_factor
+
+    # --- CBIT & CBITR ---
+    pts_cbit = (
+        (
+            neg_binom_probability_at_least(proj_cbit, 10, dispersion=3.2)
+            * 2
+            * scaling_factor
+        )
+        if is_def
+        else 0.0
+    )
+    pts_cbitr = 0.0
+    if is_mid:
+        pts_cbitr = (
+            neg_binom_probability_at_least(proj_cbitr, 12, dispersion=2.8)
+            * 2
+            * scaling_factor
+        )
+    elif is_fwd:
+        pts_cbitr = (
+            neg_binom_probability_at_least(proj_cbitr, 12, dispersion=1.7)
+            * 2
+            * scaling_factor
+        )
+
+    # --- PENALTY POINTS (Taker) ---
+    pts_penalty = 0.0
+    if player_penalty_shares and player["id"] in player_penalty_shares:
+        pen_share = player_penalty_shares[player["id"]]
+        base_pen_pts = points_config["penalty_points_per_position"].get(player_pos, 0)
+        pts_penalty = (base_pen_pts * pen_share) * scaling_factor
+
+    # --- APPEARANCE ---
+    pts_app = 2 if xMins_in_match > 60 else (1 if xMins_in_match > 0 else 0)
+
+    # --- BONUS POINTS ---
+    bps_floor = player["baseline_bps_floor_p90"] * scaling_factor
+    bps_mins = 6 if xMins_in_match >= 60 else (3 if xMins_in_match > 0 else 0)
+
+    scaled_goals = proj_goals * scaling_factor
+    scaled_assists = proj_assists * scaling_factor
+    scaled_saves = proj_saves * scaling_factor if is_gk else 0
+    scaled_pen_saves = proj_pen_saves * scaling_factor if is_gk else 0
+    scaled_yc = player["YC_share"] * team_proj_yc * scaling_factor
+    scaled_rc = player["RC_share"] * team_proj_rc * scaling_factor
+
+    bps_goals = scaled_goals * (24 if is_fwd else (18 if is_mid else 12))
+    bps_assists = scaled_assists * 9
+    bps_cs = cs_odds * 12 if (is_gk or is_def) and xMins_in_match >= 60 else 0
+    bps_saves = scaled_saves * 2
+    bps_pen_saves = scaled_pen_saves * 15
+    bps_cards = (scaled_yc * -3) + (scaled_rc * -9)
+
+    total_projected_bps = (
+        bps_floor
+        + bps_mins
+        + bps_goals
+        + bps_assists
+        + bps_cs
+        + bps_saves
+        + bps_pen_saves
+        + bps_cards
+    )
+    pts_bonus = total_projected_bps / 29.4 if not is_gk else 0.0
+
+    # --- FINAL SUM ---
+    total_pts = (
+        pts_goals
+        + pts_assists
+        + pts_cs
+        + pts_conc
+        + pts_yc
+        + pts_rc
+        + pts_saves
+        + pts_pen_save
+        + pts_cbit
+        + pts_cbitr
+        + pts_penalty
+        + pts_app
+        + pts_bonus
+    )
+
+    return {
+        "pts": total_pts,
+        "xG": proj_goals * scaling_factor,
+        "xA": proj_assists * scaling_factor,
+        "CS": cs_odds if xMins_in_match >= 60 else cs_odds * scaling_factor,
+        "cbit": proj_cbit * scaling_factor,
+        "cbitr": proj_cbitr * scaling_factor,
+    }
+
+
+def calculate_all_points(
+    player_df_base,
+    match_df,
+    player_penalty_shares,
+    MINS_SCALING_BONUS,
+    pos_map,
+    teams_dict_1,
+    teams_dict,
+    points_config,
+    effective_xmins_overrides,
+    MINS_THRESHOLD,
+    RAMP_UP_PERIOD,
+    decay_rates,
+    ramp_up_rates,
+    user_player_status_overrides,
+    team_skepticism,
+    effective_availability_multipliers,
+):
+    RAMP_UP_PERIOD = 3
+    player_df = player_df_base.copy()
+
+    final_df_output = pd.DataFrame(
+        {
+            "Pos": player_df["element_type"].map(pos_map),
+            "ID": player_df["id"],
+            "Name": player_df["web_name"],
+            "BV": player_df["now_cost"],
+            "SV": player_df["now_cost"],
+            "Team": player_df["Team"],
+        }
+    )
+
+    continuous_xMins_progression = player_df["baseline_xMins"].copy()
+    has_baseline_xmins_override = getattr(player_df, "attrs", {}).get(
+        "has_baseline_xmins_override", False
+    )
+    all_baseline_overrides = getattr(player_df, "attrs", {}).get(
+        "all_baseline_overrides", {}
+    )
+    unique_gws = sorted(match_df["GW"].unique())
+
+    match_projections_col = {index: {} for index in player_df.index}
+
+    for gw_idx, gw in enumerate(unique_gws):
+        if has_baseline_xmins_override and gw == 1:
+            for index, player in player_df.iterrows():
+                player_id = player["id"]
+                if (
+                    player_id in all_baseline_overrides
+                    and "baseline_xMins" in all_baseline_overrides[player_id]
+                ):
+                    continuous_xMins_progression.loc[index] = all_baseline_overrides[
+                        player_id
+                    ]["baseline_xMins"]
+
+        gw_calc_df = pd.DataFrame(index=player_df.index)
+        gw_calc_df["team"] = player_df["team"]
+        gw_calc_df["id"] = player_df["id"]
+        gw_calc_df["web_name"] = player_df["web_name"]
+        gw_calc_df["player_name"] = player_df["name"]
+        gw_calc_df["xG_share"] = player_df["xG_share"]
+        gw_calc_df["xA_share"] = player_df["xA_share"]
+        gw_calc_df["baseline_xMins"] = player_df["baseline_xMins"]
+        gw_calc_df["baseline_bps_floor_p90"] = player_df["baseline_bps_floor_p90"]
+        gw_calc_df["base_pts"] = 0.0
+
+        # VECTORIZED XMINS CALCULATION
+        player_ids_array = player_df["id"].values
+        n_players = len(player_ids_array)
+
+        status_list = [
+            user_player_status_overrides.get(pid, {"status": "default"})["status"]
+            for pid in player_ids_array
+        ]
+        weeks_out_list = [
+            user_player_status_overrides.get(pid, {}).get("weeks_out", 0)
+            for pid in player_ids_array
+        ]
+
+        status_array = np.array(status_list, dtype=object)
+        weeks_out_array = np.array(weeks_out_list)
+
+        is_not_starter = status_array == "not_a_starter"
+        is_suspended = status_array == "suspended"
+        is_injured = status_array == "injured"
+        is_default = ~(is_not_starter | is_suspended | is_injured)
+
+        baseline_mins_array = player_df["baseline_xMins"].values
+        prev_continuous_xmins_array = continuous_xMins_progression.values
+
+        calculated_xmins_array = np.zeros(n_players, dtype=float)
+        next_continuous_xmins_array = np.zeros(n_players, dtype=float)
+
+        first_gw = min(unique_gws)
+        is_first_gw = gw == first_gw
+        is_available_first_gw = ~(is_not_starter | is_suspended | is_injured)
+
+        # CASE 1: First GW + Available
+        if is_first_gw:
+            mask_first_available = is_available_first_gw
+            calculated_xmins_array[mask_first_available] = baseline_mins_array[
+                mask_first_available
+            ]
+
+        calculated_xmins_array[is_not_starter] = 0
+
+        # CASE 3: Suspended
+        mask_suspended_during = is_suspended & (gw <= weeks_out_array)
+        mask_suspended_return = is_suspended & (gw == weeks_out_array + 1)
+        mask_suspended_after = is_suspended & (gw > weeks_out_array + 1)
+
+        calculated_xmins_array[mask_suspended_during] = 0
+        calculated_xmins_array[mask_suspended_return] = baseline_mins_array[
+            mask_suspended_return
+        ]
+
+        decay_rate_susp = decay_rates.get("suspended", decay_rates.get("default", 0.99))
+        ramp_rate_susp = ramp_up_rates.get("suspended", ramp_up_rates.get("default", 0))
+
+        mask_susp_decay = mask_suspended_after & (
+            prev_continuous_xmins_array >= MINS_THRESHOLD
+        )
+        mask_susp_ramp = mask_suspended_after & (
+            prev_continuous_xmins_array < MINS_THRESHOLD
+        )
+
+        calculated_xmins_array[mask_susp_decay] = (
+            prev_continuous_xmins_array[mask_susp_decay] * decay_rate_susp
+        )
+        calculated_xmins_array[mask_susp_ramp] = np.minimum(
+            prev_continuous_xmins_array[mask_susp_ramp] + ramp_rate_susp, 90
+        )
+
+        # CASE 4: Injured
+        mask_injured_out = is_injured & (gw <= weeks_out_array)
+        calculated_xmins_array[mask_injured_out] = 0
+
+        mask_injured_recovering = is_injured & (gw > weeks_out_array)
+        weeks_since_injury_array = np.maximum(0, gw - weeks_out_array)
+
+        mask_ramp_phase = mask_injured_recovering & (
+            weeks_since_injury_array <= RAMP_UP_PERIOD
+        )
+        calculated_xmins_array[mask_ramp_phase] = (
+            baseline_mins_array[mask_ramp_phase] / RAMP_UP_PERIOD
+        ) * weeks_since_injury_array[mask_ramp_phase]
+
+        mask_post_ramp = mask_injured_recovering & (
+            weeks_since_injury_array > RAMP_UP_PERIOD
+        )
+
+        decay_rate_default = decay_rates.get("default", 0.99)
+        ramp_rate_default = ramp_up_rates.get(
+            "default", ramp_up_rates.get("injured", 0)
+        )
+
+        mask_post_decay = mask_post_ramp & (
+            prev_continuous_xmins_array >= MINS_THRESHOLD
+        )
+        mask_post_ramp_up = mask_post_ramp & (
+            prev_continuous_xmins_array < MINS_THRESHOLD
+        )
+
+        calculated_xmins_array[mask_post_decay] = (
+            prev_continuous_xmins_array[mask_post_decay] * decay_rate_default
+        )
+        calculated_xmins_array[mask_post_ramp_up] = np.minimum(
+            prev_continuous_xmins_array[mask_post_ramp_up] + ramp_rate_default, 90
+        )
+
+        # CASE 5: Default/healthy
+        mask_default_calc = is_default & ~(is_first_gw & is_available_first_gw)
+        element_type_array = player_df["element_type"].values
+        is_gk = element_type_array == 1
+
+        mask_gk_default = mask_default_calc & is_gk
+        calculated_xmins_array[mask_gk_default] = prev_continuous_xmins_array[
+            mask_gk_default
+        ]
+
+        mask_outfield_default = mask_default_calc & (~is_gk)
+        mask_outf_decay = mask_outfield_default & (
+            prev_continuous_xmins_array >= MINS_THRESHOLD
+        )
+        calculated_xmins_array[mask_outf_decay] = (
+            prev_continuous_xmins_array[mask_outf_decay] * decay_rate_default
+        )
+
+        mask_outf_ramp = (
+            mask_outfield_default
+            & (prev_continuous_xmins_array < MINS_THRESHOLD)
+            & (baseline_mins_array > 0)
+        )
+        calculated_xmins_array[mask_outf_ramp] = np.minimum(
+            prev_continuous_xmins_array[mask_outf_ramp] + ramp_rate_default, 90
+        )
+
+        calculated_xmins_array = np.clip(calculated_xmins_array, 0, 90)
+        next_continuous_xmins_array = calculated_xmins_array.copy()
+
+        # APPLY OVERRIDES AND AVAILABILITY
+        xMins_for_current_gw_display = calculated_xmins_array.copy()
+        for idx in range(n_players):
+            player_id = player_ids_array[idx]
+            availability_mult = effective_availability_multipliers.get(
+                player_id, {}
+            ).get(gw, 1.0)
+            xMins_for_current_gw_display[idx] *= availability_mult
+
+            if (
+                player_id in effective_xmins_overrides
+                and gw in effective_xmins_overrides[player_id]
+            ):
+                xMins_for_current_gw_display[idx] = effective_xmins_overrides[
+                    player_id
+                ][gw]
+
+        xMins_for_current_gw_display = pd.Series(
+            xMins_for_current_gw_display, index=player_df.index
+        )
+        next_gw_continuous_xMins = pd.Series(
+            next_continuous_xmins_array, index=player_df.index
+        )
+        gw_calc_df[f"{gw}_xMins"] = xMins_for_current_gw_display
+
+        # STREAMLINED MATCH SCORING LOOP
+        gw_matches = match_df[match_df["GW"] == gw]
+
+        for index, player in player_df.iterrows():
+            player_team_num = player["team"]
+            my_matches = gw_matches[
+                (gw_matches["home_team_num"] == player_team_num)
+                | (gw_matches["away_team_num"] == player_team_num)
+            ]
+
+            if my_matches.empty:
+                gw_calc_df.loc[index, "base_pts"] = 0
+                gw_calc_df.loc[index, f"{gw}_xMins"] = 0
+                gw_calc_df.loc[index, "gw_xG"] = 0.0
+                gw_calc_df.loc[index, "gw_xA"] = 0.0
+                gw_calc_df.loc[index, "gw_CS"] = 0.0
+                gw_calc_df.loc[index, "gw_cbit"] = 0.0
+                gw_calc_df.loc[index, "gw_cbitr"] = 0.0
+                continue
+
+            base_gw_mins = gw_calc_df.loc[index, f"{gw}_xMins"]
+            mins_per_match = (
+                base_gw_mins * 0.97
+                if len(my_matches) > 1 and base_gw_mins > 35
+                else base_gw_mins
+            )
+
+            total_gw_pts = 0
+            total_gw_xg = 0
+            total_gw_xa = 0
+            total_gw_cs = 0
+            total_gw_cbit = 0
+            total_gw_cbitr = 0
+
+            for _, match_row in my_matches.iterrows():
+                stats = calculate_single_match_points(
+                    player=player,
+                    match_row=match_row,
+                    xMins_in_match=mins_per_match,
+                    points_config=points_config,
+                    player_penalty_shares=player_penalty_shares,
+                    is_gk=(player["element_type"] == 1),
+                    is_def=(player["element_type"] == 2),
+                    is_mid=(player["element_type"] == 3),
+                    is_fwd=(player["element_type"] == 4),
+                )
+                total_gw_pts += stats["pts"]
+                total_gw_xg += stats["xG"]
+                total_gw_xa += stats["xA"]
+                total_gw_cs += stats["CS"]
+                total_gw_cbit += stats["cbit"]
+                total_gw_cbitr += stats["cbitr"]
+
+                is_home = player_team_num == match_row["home_team_num"]
+                opp_num = (
+                    match_row["away_team_num"]
+                    if is_home
+                    else match_row["home_team_num"]
+                )
+                match_id = (
+                    f"{match_row['home_team_num']}_vs_{match_row['away_team_num']}"
+                )
+
+                match_projections_col[index][match_id] = {
+                    "opponent_team_id": int(opp_num),
+                    "is_home": bool(is_home),
+                    "default_gw": int(gw),
+                    "Pts": round(stats["pts"], 3),
+                    "xMins": round(mins_per_match, 1),
+                    "xG": round(stats["xG"], 3),
+                    "xA": round(stats["xA"], 3),
+                    "CS": round(stats["CS"], 3),
+                }
+
+            gw_calc_df.loc[index, "base_pts"] = total_gw_pts
+            gw_calc_df.loc[index, "gw_xG"] = total_gw_xg
+            gw_calc_df.loc[index, "gw_xA"] = total_gw_xa
+            gw_calc_df.loc[index, "gw_CS"] = total_gw_cs
+            gw_calc_df.loc[index, "gw_cbit"] = total_gw_cbit
+            gw_calc_df.loc[index, "gw_cbitr"] = total_gw_cbitr
+
+        gw_calc_df = apply_team_skepticism(gw_calc_df, team_skepticism)
+        gw_calc_df["total_pts"] = gw_calc_df["base_pts"]
+
+        final_df_output[f"{gw}_xMins"] = round(gw_calc_df[f"{gw}_xMins"], 0)
+        final_df_output[f"{gw}_Pts"] = round(gw_calc_df["total_pts"], 2)
+        final_df_output[f"{gw}_xG"] = round(gw_calc_df["gw_xG"], 2)
+        final_df_output[f"{gw}_xA"] = round(gw_calc_df["gw_xA"], 2)
+        final_df_output[f"{gw}_CS"] = gw_calc_df["gw_CS"]
+        final_df_output[f"{gw}_cbit"] = gw_calc_df["gw_cbit"]
+        final_df_output[f"{gw}_cbitr"] = gw_calc_df["gw_cbitr"]
+        continuous_xMins_progression = next_gw_continuous_xMins.copy()
+
+    final_df_output["Total Points"] = final_df_output.filter(like="_Pts").sum(axis=1)
+    final_df_output["Average Points"] = round(
+        (final_df_output.filter(like="_Pts").sum(axis=1)) / len(unique_gws), 2
+    )
+    final_df_output["match_projections"] = pd.Series(match_projections_col)
+    return final_df_output

ewmapois_model.csv

@@ -0,0 +1,72 @@
+GW,home_team,away_team,expected_home_goals,expected_away_goals,home_win_prob,draw_prob,away_win_prob,home_clean_sheet_odds,away_clean_sheet_odds,mc_home_goals_mean,mc_home_goals_std,mc_away_goals_mean,mc_away_goals_std,mc_home_assists_xa_mean,mc_home_assists_xa_std,mc_away_assists_xa_mean,mc_away_assists_xa_std,mc_home_CBIT_mean,mc_home_CBIT_std,mc_away_CBIT_mean,mc_away_CBIT_std,mc_home_CBITR_mean,mc_home_CBITR_std,mc_away_CBITR_mean,mc_away_CBITR_std,mc_home_keeper_saves_mean,mc_home_keeper_saves_std,mc_away_keeper_saves_mean,mc_away_keeper_saves_std,mc_home_yc_mean,mc_away_yc_mean,mc_home_rc_mean,mc_away_rc_mean,home_strength_xa_strength,away_strength_xa_strength,home_strength_cbit_strength,away_strength_cbit_strength,home_strength_cbitr_strength,away_strength_cbitr_strength,home_strength_keeper_save_strength,away_strength_keeper_save_strength,home_strength_possession_strength,away_strength_possession_strength,home_strength_yc_strength,away_strength_yc_strength,home_strength_rc_strength,away_strength_rc_strength,home_strength_attack_strength,home_strength_defense_strength,away_strength_attack_strength,away_strength_defense_strength,exact_score_prob_0-0,exact_score_prob_0-1,exact_score_prob_0-2,exact_score_prob_0-3,exact_score_prob_1-0,exact_score_prob_1-1,exact_score_prob_1-2,exact_score_prob_2-0,exact_score_prob_2-1,exact_score_prob_3-0,exact_score_prob_3-1,exact_score_prob_4-0
+32,Arsenal,AFC Bournemouth,2.11,0.8,0.677,0.193,0.13,0.4503,0.1212,2.11,1.45,0.8,0.89,1.25,1.12,0.6,0.77,48.12,6.99,56.51,7.49,101.02,10.12,106.31,10.35,2.94,1.71,3.9,1.98,1.62,2.42,0.05,0.07,1.28,0.91,40.52,54.81,86.13,106.79,2.02,3.14,48.74,37.77,1.24,2.53,0.15,0.23,1.74,1.81,1.45,1.01,,,,,0.1153,0.0918,,0.1215,0.097,0.0855,,
+32,Brentford,Everton,1.44,1.04,0.4621,0.2649,0.2729,0.3543,0.238,1.44,1.2,1.04,1.02,0.98,0.99,0.73,0.84,46.86,6.85,53.96,7.3,99.66,9.98,107.61,10.35,2.79,1.67,3.64,1.92,1.71,2.04,0.06,0.07,0.98,0.73,53.71,58.89,105.25,105.85,3.74,3.39,35.79,35.19,2.02,2.2,0.0,0.02,1.44,1.09,1.13,1.23,,0.0876,,,0.1212,0.1254,,0.0869,0.0901,,,
+32,Burnley,Brighton and Hove Albion,0.96,1.75,0.2065,0.2352,0.5583,0.1744,0.3821,0.96,0.98,1.75,1.32,1.0,0.99,0.95,0.99,48.98,6.95,54.33,7.34,98.75,9.95,103.08,10.23,2.92,1.72,3.05,1.75,1.9,1.93,0.06,0.06,0.98,1.06,49.63,50.78,94.86,98.02,2.35,2.49,46.88,47.62,1.66,1.78,0.04,0.12,0.92,0.79,1.38,1.17,0.0666,0.1165,0.1016,,,0.1118,0.0978,,,,,
+32,Chelsea,Manchester City,1.46,1.53,0.3618,0.243,0.3952,0.2158,0.2328,1.46,1.21,1.53,1.24,0.93,0.97,1.02,1.01,51.39,7.24,55.15,7.46,101.25,10.08,102.84,10.11,3.39,1.84,3.67,1.94,2.01,1.91,0.06,0.06,1.07,1.43,44.2,37.37,92.94,80.6,2.86,2.11,50.18,54.61,2.14,1.02,0.11,0.13,1.69,1.18,1.82,1.43,,0.0771,,,0.0733,0.1121,0.0861,,0.0818,,,
+32,Crystal Palace,Newcastle United,1.42,1.33,0.3926,0.2546,0.3529,0.2632,0.2413,1.42,1.19,1.33,1.16,1.03,1.03,0.91,0.94,49.19,6.96,53.69,7.34,102.15,10.19,106.35,10.4,3.11,1.76,3.38,1.84,1.78,1.94,0.06,0.06,0.94,1.11,61.32,47.92,112.2,96.62,2.65,3.04,37.3,42.06,1.67,1.69,0.15,0.0,1.22,1.14,1.52,1.06,,0.0849,,,0.0904,0.1204,0.0804,,0.0857,,,
+32,Liverpool,Fulham,1.99,1.07,0.5861,0.2142,0.1996,0.342,0.1368,1.99,1.41,1.07,1.04,1.32,1.16,0.75,0.87,48.04,6.97,58.14,7.73,97.54,9.75,107.49,10.4,2.9,1.7,3.89,1.95,1.63,2.21,0.06,0.06,1.44,0.88,45.45,55.07,95.08,104.31,2.96,3.03,51.51,45.23,1.34,1.98,0.17,0.0,1.69,1.21,1.3,1.05,,,,,0.0932,0.0997,,0.0925,0.0993,,0.0658,
+32,Manchester United,Leeds United,1.93,1.1,0.5684,0.2196,0.212,0.3343,0.1449,1.93,1.39,1.1,1.05,1.07,1.03,0.99,1.0,51.07,7.13,54.11,7.31,102.37,10.18,103.16,10.04,2.97,1.71,3.45,1.86,1.84,2.03,0.06,0.07,0.94,1.39,52.35,45.49,104.31,89.82,2.78,1.72,45.17,50.45,2.19,1.44,0.03,0.0,1.53,1.15,1.26,0.98,,,,,0.0937,0.1024,,0.0904,0.099,,0.0638,
+32,Nottingham Forest,Aston Villa,1.21,1.19,0.3675,0.2758,0.3567,0.3035,0.2968,1.21,1.1,1.19,1.09,0.88,0.95,0.83,0.89,48.36,7.01,52.17,7.25,99.68,10.03,105.31,10.2,2.92,1.7,3.24,1.84,1.96,1.96,0.06,0.06,0.75,0.96,63.78,44.39,110.69,89.07,3.1,3.03,33.39,42.87,2.59,1.7,0.0,0.27,1.12,1.11,1.32,1.14,0.0899,0.1075,,,0.1095,0.1303,,,0.0792,,,
+32,Sunderland,Tottenham Hotspur,1.26,1.2,0.3767,0.2724,0.3509,0.3007,0.285,1.26,1.12,1.2,1.1,1.05,1.02,0.85,0.91,48.45,6.93,53.12,7.34,98.18,9.97,104.19,10.17,2.8,1.66,3.15,1.77,1.86,2.05,0.06,0.06,0.85,0.97,60.41,52.96,106.56,100.34,2.06,3.26,39.44,46.89,2.65,1.81,0.06,0.01,0.92,1.04,1.26,0.9,0.0856,0.1031,,,0.1077,0.1291,,,0.0811,,,
+32,West Ham United,Wolverhampton Wanderers,1.53,1.03,0.4879,0.2563,0.2558,0.3566,0.2169,1.53,1.24,1.03,1.02,0.97,0.98,0.76,0.87,46.74,6.8,52.78,7.21,96.33,9.75,104.1,10.11,2.64,1.63,3.34,1.82,1.7,1.99,0.05,0.06,0.81,0.69,57.65,54.48,103.85,105.94,3.7,2.86,38.28,41.79,1.98,1.67,0.01,0.02,1.2,0.95,0.98,0.97,,0.0799,,,0.1183,0.1217,,0.0903,0.0931,,,
+33,Aston Villa,Sunderland,1.56,0.8,0.5524,0.2544,0.1932,0.4472,0.2102,1.56,1.25,0.8,0.9,1.05,1.02,0.77,0.88,47.69,6.91,54.06,7.39,99.58,9.94,104.21,10.19,2.59,1.6,3.32,1.84,1.77,2.33,0.06,0.06,0.96,0.85,44.39,60.41,89.07,106.56,3.03,2.06,42.87,39.44,1.7,2.65,0.27,0.06,1.32,1.14,0.92,1.04,0.0939,,,,0.1468,0.1179,,0.1143,0.092,,,
+33,Brentford,Fulham,1.69,1.2,0.4893,0.24,0.2707,0.3025,0.1848,1.69,1.3,1.2,1.09,1.06,1.02,0.81,0.91,48.04,6.93,53.79,7.33,97.52,9.83,107.45,10.47,2.94,1.72,3.58,1.87,1.77,2.07,0.06,0.06,0.98,0.88,53.71,55.07,105.25,104.31,3.74,3.03,35.79,45.23,2.02,1.98,0.0,0.0,1.44,1.09,1.3,1.05,,,,,0.0945,0.1127,0.0675,0.0797,0.0953,,,
+33,Chelsea,Manchester United,1.82,1.29,0.4974,0.2295,0.2731,0.2746,0.1627,1.82,1.35,1.29,1.14,1.06,1.02,0.81,0.9,48.33,6.98,55.17,7.36,98.41,9.97,102.81,10.12,3.07,1.76,3.78,1.94,1.87,2.2,0.05,0.06,1.07,0.94,44.2,52.35,92.94,104.31,2.86,2.78,50.18,45.17,2.14,2.19,0.11,0.03,1.69,1.18,1.53,1.15,,,,,0.0812,0.1047,0.0678,0.0737,0.0952,,,
+33,Crystal Palace,West Ham United,1.59,1.06,0.4986,0.2499,0.2515,0.3482,0.2032,1.59,1.26,1.06,1.03,1.07,1.03,0.75,0.86,47.43,6.91,53.88,7.31,99.54,9.86,106.15,10.28,2.76,1.66,3.49,1.88,1.65,2.07,0.05,0.06,0.94,0.81,61.32,57.65,112.2,103.85,2.65,3.7,37.3,38.28,1.67,1.98,0.15,0.01,1.22,1.14,1.2,0.95,,0.0748,,,0.1129,0.1188,,0.0898,0.0948,,,
+33,Everton,Liverpool,1.15,1.37,0.3131,0.2664,0.4205,0.2533,0.3178,1.15,1.07,1.37,1.17,0.84,0.91,1.0,1.0,51.36,7.18,52.1,7.1,102.76,10.24,104.31,10.24,3.35,1.84,3.25,1.8,1.97,1.81,0.05,0.06,0.73,1.44,58.89,45.45,105.85,95.08,3.39,2.96,35.19,51.51,2.2,1.34,0.02,0.17,1.13,1.23,1.69,1.21,0.0804,0.1107,,,0.0924,0.1266,0.087,,,,,
+33,Leeds United,Wolverhampton Wanderers,1.6,1.0,0.5134,0.2498,0.2368,0.3679,0.202,1.6,1.26,1.0,1.0,1.33,1.16,0.75,0.86,46.72,6.88,57.52,7.6,96.25,9.8,107.18,10.45,2.5,1.57,3.5,1.85,1.6,2.13,0.05,0.07,1.39,0.69,45.49,54.48,89.82,105.94,1.72,2.86,50.45,41.79,1.44,1.67,0.0,0.02,1.26,0.98,0.98,0.97,,0.0744,,,0.119,0.1187,,0.0951,0.0951,,,
+33,Manchester City,Arsenal,1.24,1.22,0.3683,0.273,0.3587,0.2967,0.2908,1.24,1.11,1.22,1.1,0.99,1.0,0.87,0.94,50.31,7.04,57.95,7.57,101.79,10.29,106.06,10.32,3.26,1.8,3.85,1.95,1.76,1.88,0.06,0.07,1.43,1.28,37.37,40.52,80.6,86.13,2.11,2.02,54.61,48.74,1.02,1.24,0.13,0.15,1.82,1.43,1.74,1.81,0.0861,0.105,,,0.1067,0.1293,,,0.08,,,
+33,Newcastle United,AFC Bournemouth,1.85,1.36,0.489,0.2267,0.2843,0.256,0.1578,1.85,1.36,1.36,1.17,1.13,1.06,0.83,0.91,48.07,6.89,55.0,7.45,101.17,10.13,106.82,10.31,3.02,1.74,3.69,1.92,1.81,2.22,0.06,0.07,1.11,0.91,47.92,54.81,96.62,106.79,3.04,3.14,42.06,37.77,1.69,2.53,0.0,0.23,1.52,1.06,1.45,1.01,,,,,0.0747,0.1015,0.0692,0.0688,0.0938,,,
+33,Nottingham Forest,Burnley,1.75,0.83,0.5925,0.233,0.1746,0.4379,0.1744,1.75,1.32,0.83,0.91,1.02,1.02,0.81,0.89,48.52,6.91,52.08,7.31,98.22,9.92,105.28,10.19,2.62,1.63,3.14,1.76,1.79,2.03,0.05,0.06,0.75,0.98,63.78,49.63,110.69,94.86,3.1,2.35,33.39,46.88,2.59,1.66,0.0,0.04,1.12,1.11,0.92,0.79,0.0763,,,,0.1335,0.11,,0.1164,0.0962,,,
+33,Tottenham Hotspur,Brighton and Hove Albion,1.32,1.54,0.3265,0.248,0.4256,0.2146,0.2677,1.32,1.15,1.54,1.24,0.99,0.99,0.95,0.98,48.98,7.01,54.23,7.47,98.93,9.8,102.9,10.17,3.04,1.75,3.3,1.83,1.88,1.99,0.06,0.07,0.97,1.06,52.96,50.78,100.34,98.02,3.26,2.49,46.89,47.62,1.81,1.78,0.01,0.12,1.26,0.9,1.38,1.17,,0.0885,,,0.0758,0.1164,0.0897,,0.0768,,,
+34,Burnley,Manchester City,0.79,2.29,0.1125,0.1746,0.7129,0.1009,0.4545,0.79,0.89,2.29,1.51,0.91,0.95,1.13,1.06,51.36,7.25,54.36,7.4,101.22,10.09,102.89,10.13,3.37,1.83,3.0,1.73,2.06,1.75,0.05,0.06,0.98,1.43,49.63,37.37,94.86,80.6,2.35,2.11,46.88,54.61,1.66,1.02,0.04,0.13,0.92,0.79,1.82,1.43,,0.1053,0.1206,0.0922,,0.0828,0.0951,,,,,
+34,Arsenal,Newcastle United,2.02,0.84,0.6484,0.2043,0.1473,0.4317,0.1329,2.02,1.42,0.84,0.92,1.21,1.1,0.69,0.84,49.18,7.02,56.67,7.57,101.95,10.14,106.4,10.19,3.07,1.75,3.84,1.95,1.58,2.14,0.06,0.06,1.28,1.11,40.52,47.92,86.13,96.62,2.02,3.04,48.74,42.06,1.24,1.69,0.15,0.0,1.74,1.81,1.52,1.06,,,,,0.1159,0.0971,,0.1168,0.0981,0.0786,,
+34,Brighton and Hove Albion,Chelsea,1.44,1.44,0.3742,0.2484,0.3774,0.2359,0.2375,1.44,1.2,1.44,1.2,1.05,1.03,0.86,0.93,49.04,7.08,55.02,7.31,97.99,10.0,103.92,10.22,3.21,1.8,3.48,1.86,1.89,2.11,0.06,0.06,1.06,1.07,50.78,44.2,98.02,92.94,2.49,2.86,47.62,50.18,1.78,2.14,0.12,0.11,1.38,1.17,1.69,1.18,,0.081,,,0.0806,0.1162,0.084,,0.0836,,,
+34,AFC Bournemouth,Leeds United,1.82,1.24,0.5106,0.2292,0.2601,0.2892,0.1615,1.82,1.35,1.24,1.11,1.04,1.02,1.04,1.02,51.12,7.18,53.45,7.26,102.62,10.09,105.68,10.16,2.94,1.7,3.38,1.84,1.95,2.04,0.06,0.06,0.91,1.39,54.81,45.49,106.79,89.82,3.14,1.72,37.77,50.45,2.53,1.44,0.23,0.0,1.45,1.01,1.26,0.98,,,,,0.0852,0.1055,0.0655,0.0776,0.0963,,,
+34,Fulham,Aston Villa,1.41,1.26,0.4037,0.2588,0.3375,0.2825,0.2449,1.41,1.19,1.26,1.12,0.95,0.98,0.84,0.92,48.42,6.95,53.44,7.27,99.63,10.06,102.2,10.05,2.92,1.72,3.46,1.84,1.88,2.05,0.05,0.06,0.88,0.96,55.07,44.39,104.31,89.07,3.03,3.03,45.23,42.87,1.98,1.7,0.0,0.27,1.3,1.05,1.32,1.14,,0.0876,,,0.0975,0.1229,0.0778,,0.0866,,,
+34,Liverpool,Crystal Palace,1.83,1.01,0.5653,0.2279,0.2068,0.3642,0.161,1.83,1.35,1.01,1.01,1.27,1.12,0.79,0.89,48.15,7.0,57.92,7.62,101.81,10.06,107.69,10.45,2.82,1.67,3.82,1.98,1.63,2.14,0.05,0.07,1.44,0.94,45.45,61.32,95.08,112.2,2.96,2.65,51.51,37.3,1.34,1.67,0.17,0.15,1.69,1.21,1.22,1.14,,,,,0.1072,0.108,,0.0978,0.0988,,0.0601,
+34,Manchester United,Brentford,1.73,1.25,0.4874,0.236,0.2766,0.2865,0.1769,1.73,1.32,1.25,1.12,1.02,1.0,0.82,0.9,48.31,6.9,54.03,7.24,102.97,10.04,103.15,10.1,3.01,1.75,3.76,1.95,1.78,2.09,0.06,0.07,0.94,0.98,52.35,53.71,104.31,105.25,2.78,3.74,45.17,35.79,2.19,2.02,0.03,0.0,1.53,1.15,1.44,1.09,,,,,0.0879,0.1096,0.0686,0.076,0.095,,,
+34,Sunderland,Nottingham Forest,1.02,1.08,0.3351,0.2997,0.3652,0.3411,0.3617,1.02,1.01,1.08,1.04,0.96,0.97,0.76,0.86,47.07,6.95,53.09,7.27,100.89,10.05,104.15,10.17,2.63,1.63,3.08,1.77,1.81,2.13,0.05,0.06,0.85,0.75,60.41,63.78,106.56,110.69,2.06,3.1,39.44,33.39,2.65,2.59,0.06,0.0,0.92,1.04,1.12,1.11,0.1232,0.1329,,,0.1256,0.1348,0.0726,,,,,
+34,West Ham United,Everton,1.2,1.19,0.3639,0.2766,0.3594,0.3033,0.3005,1.2,1.1,1.19,1.09,0.87,0.94,0.8,0.89,46.86,6.81,52.78,7.21,99.77,10.02,103.99,10.18,2.82,1.67,3.41,1.86,1.77,2.01,0.06,0.06,0.81,0.73,57.65,58.89,103.85,105.85,3.7,3.39,38.28,35.19,1.98,2.2,0.01,0.02,1.2,0.95,1.13,1.23,0.091,0.1089,,,0.1097,0.1306,,,0.0786,,,
+34,Wolverhampton Wanderers,Tottenham Hotspur,1.34,1.3,0.3787,0.2617,0.3596,0.2737,0.2627,1.34,1.16,1.3,1.14,0.95,0.97,0.89,0.94,48.45,7.04,51.9,7.21,97.87,9.83,101.06,10.06,2.86,1.67,3.14,1.77,1.75,1.97,0.05,0.06,0.69,0.97,54.48,52.96,105.94,100.34,2.86,3.26,41.79,46.89,1.67,1.81,0.02,0.01,0.98,0.97,1.26,0.9,,0.0933,,,0.0962,0.1244,0.0807,,0.0832,,,
+35,Arsenal,Fulham,2.04,0.72,0.6839,0.1957,0.1204,0.4876,0.1294,2.04,1.43,0.72,0.85,1.24,1.11,0.58,0.77,47.77,6.9,56.63,7.53,97.77,9.93,106.13,10.34,2.84,1.67,3.91,1.96,1.53,2.26,0.05,0.06,1.28,0.88,40.52,55.07,86.13,104.31,2.02,3.03,48.74,45.23,1.24,1.98,0.15,0.0,1.74,1.81,1.3,1.05,,,,,0.1292,0.0926,,0.1319,0.0948,0.0899,,
+35,Aston Villa,Tottenham Hotspur,1.81,1.1,0.54,0.2301,0.23,0.3321,0.1633,1.81,1.35,1.1,1.05,1.11,1.05,0.82,0.91,48.42,6.95,54.07,7.39,97.86,9.95,104.29,10.18,2.86,1.69,3.51,1.88,1.76,2.16,0.06,0.06,0.96,0.97,44.39,52.96,89.07,100.34,3.03,3.26,42.87,46.89,1.7,1.81,0.27,0.01,1.32,1.14,1.26,0.9,,0.0598,,,0.0984,0.1082,,0.089,0.0982,,,
+35,AFC Bournemouth,Crystal Palace,1.56,1.21,0.4554,0.2497,0.2949,0.299,0.2099,1.56,1.25,1.21,1.1,0.98,0.99,0.88,0.94,48.25,7.0,53.57,7.38,101.81,10.23,105.65,10.28,2.87,1.71,3.5,1.89,1.83,2.05,0.06,0.06,0.91,0.94,54.81,61.32,106.79,112.2,3.14,2.65,37.77,37.3,2.53,1.67,0.23,0.15,1.45,1.01,1.22,1.14,,0.0759,,,0.0981,0.1181,,0.0765,0.0923,,,
+35,Brentford,West Ham United,1.87,1.11,0.552,0.2253,0.2227,0.3311,0.1544,1.87,1.37,1.11,1.05,1.1,1.05,0.77,0.88,47.4,6.89,53.83,7.34,99.5,10.03,107.4,10.5,2.87,1.69,3.66,1.92,1.69,2.13,0.05,0.06,0.98,0.81,53.71,57.65,105.25,103.85,3.74,3.7,35.79,38.28,2.02,1.98,0.0,0.01,1.44,1.09,1.2,0.95,,,,,0.0956,0.1054,,0.0892,0.0986,,0.0614,
+35,Chelsea,Nottingham Forest,1.88,0.95,0.5923,0.2217,0.186,0.3874,0.1526,1.88,1.37,0.95,0.97,1.08,1.04,0.72,0.85,47.02,6.9,55.04,7.48,100.85,9.93,103.01,10.26,2.69,1.62,3.84,1.96,1.72,2.34,0.06,0.06,1.07,0.75,44.2,63.78,92.94,110.69,2.86,3.1,50.18,33.39,2.14,2.59,0.11,0.0,1.69,1.18,1.12,1.11,,,,,0.1113,0.1053,,0.1045,0.0991,0.0655,,
+35,Everton,Manchester City,0.97,1.48,0.2489,0.2626,0.4885,0.2287,0.3785,0.97,0.99,1.48,1.21,0.76,0.87,1.0,1.0,51.34,7.24,52.16,7.17,101.3,10.15,104.33,10.16,3.43,1.86,3.12,1.74,2.04,1.68,0.05,0.06,0.73,1.43,58.89,37.37,105.85,80.6,3.39,2.11,35.19,54.61,2.2,1.02,0.02,0.13,1.13,1.23,1.82,1.43,0.0864,0.1278,0.0942,,,0.1239,0.0915,,,,,
+35,Leeds United,Burnley,1.96,0.94,0.6112,0.214,0.1749,0.391,0.1414,1.96,1.4,0.94,0.97,1.39,1.19,0.89,0.94,48.7,7.0,57.55,7.58,98.14,9.88,107.23,10.32,2.5,1.58,3.4,1.84,1.66,2.21,0.05,0.07,1.39,0.98,45.49,49.63,89.82,94.86,1.72,2.35,50.45,46.88,1.44,1.66,0.0,0.04,1.26,0.98,0.92,0.79,,,,,0.1083,0.1014,,0.1058,0.0993,0.069,,
+35,Manchester United,Liverpool,1.55,1.47,0.3974,0.2413,0.3612,0.2294,0.2112,1.55,1.25,1.47,1.21,0.96,0.98,1.04,1.01,51.36,7.08,54.0,7.35,102.68,10.15,103.27,10.14,3.3,1.82,3.65,1.92,1.92,1.92,0.06,0.06,0.94,1.44,52.35,45.45,104.31,95.08,2.78,2.96,45.17,51.51,2.19,1.34,0.03,0.17,1.53,1.15,1.69,1.21,,0.0714,,,0.0754,0.1108,0.0817,,0.0862,,,
+35,Newcastle United,Brighton and Hove Albion,1.6,1.3,0.4429,0.2445,0.3126,0.2714,0.2024,1.6,1.26,1.3,1.14,1.06,1.03,0.89,0.96,48.97,7.0,55.11,7.51,99.07,10.01,106.59,10.27,2.98,1.72,3.59,1.89,1.79,2.03,0.06,0.07,1.11,1.06,47.92,50.78,96.62,98.02,3.04,2.49,42.06,47.62,1.69,1.78,0.0,0.12,1.52,1.06,1.38,1.17,,0.0717,,,0.0878,0.1143,0.0746,,0.0914,,,
+35,Wolverhampton Wanderers,Sunderland,1.15,0.95,0.4036,0.2975,0.2989,0.3884,0.3166,1.15,1.07,0.95,0.97,0.87,0.93,0.83,0.91,47.66,6.91,51.93,7.15,99.59,9.97,101.35,10.06,2.57,1.58,2.96,1.74,1.74,2.08,0.06,0.06,0.69,0.85,54.48,60.41,105.94,106.56,2.86,2.06,41.79,39.44,1.67,2.65,0.02,0.06,0.98,0.97,0.92,1.04,0.1228,0.1164,,,0.1416,0.1336,,0.0813,,,,
+36,Brighton and Hove Albion,Wolverhampton Wanderers,1.76,0.83,0.5936,0.2318,0.1746,0.4352,0.1724,1.76,1.33,0.83,0.91,1.14,1.07,0.69,0.83,46.67,6.79,55.01,7.42,96.32,9.72,103.67,10.25,2.6,1.6,3.52,1.9,1.63,2.12,0.05,0.06,1.06,0.69,50.78,54.48,98.02,105.94,2.49,2.86,47.62,41.79,1.78,1.67,0.12,0.02,1.38,1.17,0.98,0.97,0.0749,,,,0.132,0.1096,,0.1159,0.0965,,,
+36,Burnley,Aston Villa,0.99,1.67,0.224,0.2429,0.5331,0.1882,0.3713,0.99,1.0,1.67,1.29,1.01,1.02,0.94,0.97,48.38,7.04,54.25,7.34,99.55,10.05,102.96,10.3,2.91,1.71,3.1,1.76,1.9,2.0,0.06,0.06,0.98,0.96,49.63,44.39,94.86,89.07,2.35,3.03,46.88,42.87,1.66,1.7,0.04,0.27,0.92,0.79,1.32,1.14,0.0698,0.1168,0.0974,,,0.1155,0.0966,,,,,
+36,Manchester City,Crystal Palace,1.96,0.86,0.6329,0.2106,0.1565,0.4249,0.1405,1.96,1.4,0.86,0.93,1.28,1.14,0.72,0.85,48.17,6.93,57.89,7.64,101.81,10.09,105.94,10.26,2.77,1.64,3.94,2.0,1.51,2.18,0.05,0.06,1.43,0.94,37.37,61.32,80.6,112.2,2.11,2.65,54.61,37.3,1.02,1.67,0.13,0.15,1.82,1.43,1.22,1.14,,,,,0.1173,0.1001,,0.1149,0.0984,0.0752,,
+36,Crystal Palace,Everton,1.22,0.99,0.4149,0.2872,0.2979,0.3714,0.2939,1.22,1.11,0.99,1.0,0.97,0.99,0.73,0.86,46.97,6.85,53.68,7.37,99.55,10.06,106.17,10.33,2.68,1.66,3.4,1.84,1.66,2.01,0.05,0.06,0.94,0.73,61.32,58.89,112.2,105.85,2.65,3.39,37.3,35.19,1.67,2.2,0.15,0.02,1.22,1.14,1.13,1.23,0.109,0.1083,,,0.1338,0.1322,,0.0818,,,,
+36,Fulham,AFC Bournemouth,1.58,1.38,0.4222,0.2433,0.3345,0.2514,0.2062,1.58,1.26,1.38,1.18,1.01,1.01,0.83,0.91,47.94,6.94,53.46,7.29,101.15,10.06,102.42,9.99,3.05,1.75,3.46,1.86,1.88,2.19,0.05,0.06,0.88,0.91,55.07,54.81,104.31,106.79,3.03,3.14,45.23,37.77,1.98,2.53,0.0,0.23,1.3,1.05,1.45,1.01,,0.0716,,,0.0819,0.1129,0.078,,0.0892,,,
+36,Liverpool,Chelsea,1.76,1.4,0.461,0.232,0.3069,0.2473,0.1725,1.76,1.33,1.4,1.18,1.25,1.12,0.85,0.93,48.99,7.07,57.98,7.66,98.11,10.0,107.57,10.41,3.24,1.79,3.87,1.94,1.83,2.22,0.05,0.07,1.44,1.07,45.45,44.2,95.08,92.94,2.96,2.86,51.51,50.18,1.34,2.14,0.17,0.11,1.69,1.21,1.69,1.18,,,,,0.0751,0.1046,0.0732,0.0659,0.092,,,
+36,Manchester City,Brentford,2.06,1.0,0.6166,0.2065,0.1769,0.3666,0.128,2.06,1.43,1.0,1.0,1.29,1.12,0.73,0.86,48.38,6.93,58.06,7.64,102.98,10.12,106.08,10.28,2.94,1.72,4.11,2.02,1.55,2.26,0.06,0.06,1.43,0.98,37.37,53.71,80.6,105.25,2.11,3.74,54.61,35.79,1.02,2.02,0.13,0.0,1.82,1.43,1.44,1.09,,,,,0.0966,0.0967,,0.0991,0.0995,,0.0682,
+36,Nottingham Forest,Newcastle United,1.3,1.37,0.355,0.2591,0.3859,0.2538,0.2714,1.3,1.14,1.37,1.17,0.91,0.94,0.9,0.94,49.32,7.03,51.95,7.23,102.06,10.03,105.25,10.16,3.12,1.76,3.23,1.81,1.91,1.9,0.06,0.06,0.75,1.11,63.78,47.92,110.69,96.62,3.1,3.04,33.39,42.06,2.59,1.69,0.0,0.0,1.12,1.11,1.52,1.06,,0.0946,,,0.0899,0.123,0.0845,,0.0803,,,
+36,Tottenham Hotspur,Leeds United,1.58,1.4,0.4192,0.2424,0.3384,0.2465,0.2052,1.58,1.26,1.4,1.18,1.07,1.04,1.08,1.05,51.04,7.07,54.28,7.23,102.47,10.16,102.67,10.26,2.99,1.76,3.23,1.79,1.87,1.95,0.06,0.06,0.97,1.39,52.96,45.49,100.34,89.82,3.26,1.72,46.89,50.45,1.81,1.44,0.01,0.0,1.26,0.9,1.26,0.98,,0.0709,,,0.0802,0.112,0.0786,,0.0888,,,
+36,Sunderland,Manchester United,0.98,1.47,0.2533,0.2633,0.4834,0.2309,0.3744,0.98,0.99,1.47,1.21,0.94,0.98,0.85,0.91,48.35,7.0,53.21,7.35,98.42,9.93,104.32,10.12,3.02,1.74,3.05,1.74,1.96,2.0,0.06,0.07,0.85,0.94,60.41,52.35,106.56,104.31,2.06,2.78,39.44,45.17,2.65,2.19,0.06,0.03,0.92,1.04,1.53,1.15,0.0863,0.1269,0.0929,,,0.1243,0.0912,,,,,
+36,West Ham United,Arsenal,0.82,1.84,0.162,0.2227,0.6153,0.1593,0.4415,0.82,0.9,1.84,1.36,0.65,0.81,1.01,1.01,50.3,7.07,52.69,7.19,101.43,10.06,103.89,10.19,3.37,1.82,3.17,1.77,2.04,1.65,0.06,0.06,0.81,1.28,57.65,40.52,103.85,86.13,3.7,2.02,38.28,48.74,1.98,1.24,0.01,0.15,1.2,0.95,1.74,1.81,,0.1293,0.1187,0.0727,,0.1055,0.097,,,,,
+37,Arsenal,Burnley,2.7,0.51,0.835,0.1176,0.0474,0.6029,0.067,2.7,1.64,0.51,0.71,1.35,1.17,0.62,0.78,48.48,6.94,56.74,7.58,98.11,9.92,106.39,10.25,2.52,1.58,3.78,1.96,1.49,2.31,0.05,0.06,1.28,0.98,40.52,49.63,86.13,94.86,2.02,2.35,48.74,46.88,1.24,1.66,0.15,0.04,1.74,1.81,0.92,0.79,,,,,0.1094,,,0.1476,0.0747,0.1329,,0.0898
+37,Aston Villa,Liverpool,1.34,1.49,0.3429,0.2504,0.4067,0.2265,0.2609,1.34,1.16,1.49,1.22,0.99,0.99,1.03,1.0,51.29,7.18,54.05,7.26,102.71,10.04,104.32,10.23,3.31,1.83,3.46,1.89,1.96,1.96,0.05,0.06,0.96,1.44,44.39,45.45,89.07,95.08,3.03,2.96,42.87,51.51,1.7,1.34,0.27,0.17,1.32,1.14,1.69,1.21,,0.0879,,,0.0795,0.1178,0.0876,,0.0792,,,
+37,AFC Bournemouth,Manchester City,1.24,1.79,0.2658,0.2317,0.5026,0.1668,0.2883,1.24,1.12,1.79,1.34,0.84,0.91,1.07,1.03,51.31,7.2,53.37,7.36,101.31,10.13,105.64,10.3,3.45,1.86,3.44,1.88,2.13,1.8,0.06,0.07,0.91,1.43,54.81,37.37,106.79,80.6,3.14,2.11,37.77,54.61,2.53,1.02,0.23,0.13,1.45,1.01,1.82,1.43,,0.0862,0.0771,,,0.107,0.0959,,0.0666,,,
+37,Brentford,Crystal Palace,1.55,1.13,0.4715,0.2524,0.2761,0.3245,0.2121,1.55,1.25,1.13,1.06,1.02,1.0,0.84,0.93,48.11,6.91,53.88,7.35,101.91,10.07,107.29,10.31,2.88,1.69,3.51,1.88,1.73,1.99,0.05,0.06,0.98,0.94,53.71,61.32,105.25,112.2,3.74,2.65,35.79,37.3,2.02,1.67,0.0,0.15,1.44,1.09,1.22,1.14,,0.0775,,,0.1068,0.12,,0.0828,0.0931,,,
+37,Chelsea,Tottenham Hotspur,2.32,1.06,0.6555,0.1855,0.159,0.3466,0.0982,2.32,1.52,1.06,1.03,1.16,1.07,0.8,0.89,48.5,6.96,55.17,7.34,98.07,9.97,103.08,10.1,2.87,1.68,3.8,1.96,1.74,2.24,0.06,0.07,1.07,0.97,44.2,52.96,92.94,100.34,2.86,3.26,50.18,46.89,2.14,1.81,0.11,0.01,1.69,1.18,1.26,0.9,,,,,0.0791,0.0836,,0.0917,0.0971,,0.0751,
+37,Everton,Sunderland,1.33,0.74,0.5069,0.284,0.2092,0.4752,0.2643,1.33,1.15,0.74,0.86,0.92,0.96,0.75,0.87,47.68,6.85,51.99,7.25,99.8,10.07,104.29,10.19,2.62,1.61,3.12,1.75,1.78,2.11,0.06,0.07,0.73,0.85,58.89,60.41,105.85,106.56,3.39,2.06,35.19,39.44,2.2,2.65,0.02,0.06,1.13,1.23,0.92,1.04,0.1254,0.0936,,,0.1673,0.1242,,0.1112,,,,
+37,Leeds United,Brighton and Hove Albion,1.32,1.42,0.3503,0.2555,0.3942,0.2423,0.2667,1.32,1.15,1.42,1.19,1.24,1.12,0.92,0.96,48.96,7.01,57.51,7.6,99.01,9.92,107.01,10.37,2.91,1.71,3.37,1.86,1.78,2.08,0.05,0.06,1.39,1.06,45.49,50.78,89.82,98.02,1.72,2.49,50.45,47.62,1.44,1.78,0.0,0.12,1.26,0.98,1.38,1.17,,0.0917,,,0.0855,0.1209,0.0858,,0.08,,,
+37,Manchester United,Nottingham Forest,1.7,0.98,0.5432,0.24,0.2168,0.376,0.1828,1.7,1.3,0.98,0.99,1.0,1.01,0.73,0.86,46.93,6.9,53.94,7.38,100.72,10.06,103.18,10.07,2.69,1.66,3.62,1.91,1.69,2.24,0.06,0.07,0.94,0.75,52.35,63.78,104.31,110.69,2.78,3.1,45.17,33.39,2.19,2.59,0.03,0.0,1.53,1.15,1.12,1.11,0.0687,,,,0.117,0.1141,,0.0992,0.0971,,,
+37,Newcastle United,West Ham United,1.98,1.13,0.5699,0.2161,0.214,0.3217,0.1381,1.98,1.41,1.13,1.06,1.16,1.08,0.79,0.88,47.35,6.92,55.01,7.34,99.43,9.99,106.73,10.35,2.82,1.66,3.79,1.94,1.66,2.15,0.05,0.06,1.11,0.81,47.92,57.65,96.62,103.85,3.04,3.7,42.06,38.28,1.69,1.98,0.0,0.01,1.52,1.06,1.2,0.95,,,,,0.0881,0.0996,,0.0871,0.0987,,0.0652,
+37,Wolverhampton Wanderers,Fulham,1.15,1.34,0.3191,0.2688,0.4121,0.2611,0.3174,1.15,1.07,1.34,1.16,0.9,0.94,0.85,0.92,47.82,6.96,51.96,7.2,97.57,9.8,101.19,10.02,2.89,1.68,3.13,1.78,1.75,1.94,0.06,0.06,0.69,0.88,54.48,55.07,105.94,104.31,2.86,3.03,41.79,45.23,1.67,1.98,0.02,0.0,0.98,0.97,1.3,1.05,0.0828,0.1114,,,0.0952,0.1275,0.0857,,,,,
+38,Brighton and Hove Albion,Manchester United,1.48,1.31,0.4142,0.252,0.3338,0.271,0.227,1.48,1.22,1.31,1.14,1.07,1.02,0.81,0.9,48.42,6.94,54.88,7.48,98.3,9.88,103.64,10.2,3.06,1.75,3.51,1.87,1.78,2.1,0.06,0.07,1.06,0.94,50.78,52.35,98.02,104.31,2.49,2.78,47.62,45.17,1.78,2.19,0.12,0.03,1.38,1.17,1.53,1.15,,0.0804,,,0.0913,0.1189,0.0778,,0.0883,,,
+38,Burnley,Wolverhampton Wanderers,1.16,1.23,0.3455,0.2764,0.3782,0.2918,0.3121,1.16,1.08,1.23,1.11,1.1,1.04,0.81,0.9,46.74,6.84,54.31,7.48,96.3,9.89,102.97,10.17,2.56,1.58,3.1,1.77,1.73,2.02,0.05,0.07,0.98,0.69,49.63,54.48,94.86,105.94,2.35,2.86,46.88,41.79,1.66,1.67,0.04,0.02,0.92,0.79,0.98,0.97,0.0909,0.1123,,,0.1062,0.1304,0.0804,,,,,
+38,Crystal Palace,Arsenal,0.83,1.53,0.205,0.2585,0.5365,0.2175,0.435,0.83,0.91,1.53,1.24,0.71,0.84,0.97,0.99,50.37,7.08,53.61,7.28,101.64,10.14,106.23,10.25,3.29,1.82,3.24,1.81,1.92,1.68,0.06,0.06,0.94,1.28,61.32,40.52,112.2,86.13,2.65,2.02,37.3,48.74,1.67,1.24,0.15,0.15,1.22,1.14,1.74,1.81,0.0945,0.1445,0.1101,,,0.12,0.0916,,,,,
+38,Fulham,Newcastle United,1.51,1.45,0.3904,0.2444,0.3652,0.2338,0.2208,1.51,1.23,1.45,1.21,1.0,1.01,0.93,0.97,49.4,6.97,53.49,7.34,102.05,10.19,102.35,10.19,3.15,1.78,3.43,1.85,1.83,1.94,0.06,0.06,0.88,1.11,55.07,47.92,104.31,96.62,3.03,3.04,45.23,42.06,1.98,1.69,0.0,0.0,1.3,1.05,1.52,1.06,,0.0751,,,0.0781,0.1132,0.0824,,0.0856,,,
+38,Liverpool,Brentford,1.91,1.18,0.5438,0.2221,0.2341,0.306,0.1476,1.91,1.38,1.18,1.09,1.29,1.12,0.8,0.9,48.36,6.92,57.94,7.63,103.23,10.17,107.48,10.42,3.01,1.75,3.98,2.0,1.63,2.2,0.05,0.07,1.44,0.98,45.45,53.71,95.08,105.25,2.96,3.74,51.51,35.79,1.34,2.02,0.17,0.0,1.69,1.21,1.44,1.09,,,,,0.0865,0.1022,,0.0827,0.0979,,0.0624,
+38,Manchester City,Aston Villa,1.96,0.92,0.6164,0.2127,0.1708,0.3966,0.1402,1.96,1.4,0.92,0.96,1.27,1.13,0.72,0.85,48.34,6.96,58.02,7.69,99.61,10.03,106.11,10.32,2.85,1.68,3.99,1.99,1.67,2.24,0.06,0.07,1.43,0.96,37.37,44.39,80.6,89.07,2.11,3.03,54.61,42.87,1.02,1.7,0.13,0.27,1.82,1.43,1.32,1.14,,,,,0.1094,0.1009,,0.1073,0.0992,0.0703,,
+38,Nottingham Forest,AFC Bournemouth,1.36,1.3,0.3843,0.2597,0.356,0.2719,0.2557,1.36,1.17,1.3,1.14,0.93,0.96,0.8,0.89,48.03,6.83,52.01,7.21,101.17,10.2,105.13,10.26,3.05,1.76,3.26,1.79,1.95,2.15,0.05,0.06,0.75,0.91,63.78,54.81,110.69,106.79,3.1,3.14,33.39,37.77,2.59,2.53,0.0,0.23,1.12,1.11,1.45,1.01,,0.0907,,,0.0949,0.1233,0.0804,,0.0842,,,
+38,Tottenham Hotspur,Everton,1.26,1.26,0.3652,0.2691,0.3657,0.2848,0.2851,1.26,1.12,1.26,1.12,0.97,0.97,0.79,0.89,46.87,6.81,54.26,7.39,99.79,9.94,102.89,10.23,2.74,1.66,3.44,1.85,1.71,2.06,0.06,0.06,0.97,0.73,52.96,58.89,100.34,105.85,3.26,3.39,46.89,35.19,1.81,2.2,0.01,0.02,1.26,0.9,1.13,1.23,0.0811,0.1021,,,0.102,0.1278,0.0804,,,,,
+38,Sunderland,Chelsea,0.95,1.62,0.2216,0.2478,0.5306,0.1976,0.3859,0.95,0.98,1.62,1.27,0.92,0.95,0.9,0.95,49.14,6.96,53.0,7.26,97.97,9.92,104.07,10.18,3.18,1.77,3.09,1.76,2.08,1.98,0.05,0.06,0.85,1.07,60.41,44.2,106.56,92.94,2.06,2.86,39.44,50.18,2.65,2.14,0.06,0.11,0.92,1.04,1.69,1.18,0.0761,0.1238,0.1002,,,0.1176,0.0955,,,,,
+38,West Ham United,Leeds United,1.52,1.33,0.4177,0.2489,0.3334,0.2645,0.2193,1.52,1.23,1.33,1.15,0.98,0.98,1.06,1.05,50.92,7.21,52.72,7.19,102.67,10.1,104.07,10.13,3.03,1.75,3.13,1.75,1.89,1.92,0.06,0.06,0.81,1.39,57.65,45.49,103.85,89.82,3.7,1.72,38.28,50.45,1.98,1.44,0.01,0.0,1.2,0.95,1.26,0.98,,0.0772,,,0.0881,0.1169,0.0778,,0.0888,,,

fpl_api.py

@@ -0,0 +1,88 @@
+import requests
+
+BASE_URL = "https://fantasy.premierleague.com/api"
+AFCON_GW = 16
+
+
+def calculate_fts(transfers, first_gw, next_gw, fh_gws, wc_gws):
+    """Exact logic ported from open-fpl-solver dev/solver.py"""
+    n_transfers = {gw: 0 for gw in range(2, next_gw + 2)}
+    for t in transfers:
+        if t["event"] in n_transfers:
+            n_transfers[t["event"]] += 1
+
+    fts = {gw: 0 for gw in range(first_gw + 1, next_gw + 2)}
+    fts[first_gw + 1] = 1
+
+    for i in range(first_gw + 2, next_gw + 1):
+        if i == AFCON_GW:
+            fts[i] = 5
+            continue
+        if (i - 1) in fh_gws or (i - 1) in wc_gws:
+            fts[i] = fts[i - 1]
+            continue
+
+        fts[i] = fts[i - 1] - n_transfers[i - 1]
+        fts[i] = max(fts[i], 0)
+        fts[i] += 1
+        fts[i] = min(fts[i], 5)
+
+    return fts.get(next_gw, 1)
+
+
+def get_fpl_team_data(team_id: int):
+    print(f"Executing strict open-fpl-solver logic for Team ID: {team_id}...")
+
+    static = requests.get(f"{BASE_URL}/bootstrap-static/").json()
+    element_to_type = {x["id"]: x["element_type"] for x in static["elements"]}
+    next_gw = next(x["id"] for x in static["events"] if x["is_next"])
+    start_prices = {
+        x["id"]: x["now_cost"] - x["cost_change_start"] for x in static["elements"]
+    }
+
+    transfers = requests.get(f"{BASE_URL}/entry/{team_id}/transfers/").json()[::-1]
+    history = requests.get(f"{BASE_URL}/entry/{team_id}/history/").json()
+
+    chips = history["chips"]
+    fh_gws = [x["event"] for x in chips if x["name"] == "freehit"]
+    wc_gws = [x["event"] for x in chips if x["name"] == "wildcard"]
+
+    first_gw = history["current"][0]["event"]
+    first_gw_data = requests.get(
+        f"{BASE_URL}/entry/{team_id}/event/{first_gw}/picks/"
+    ).json()
+
+    # Calculate exact purchase prices and ITB
+    squad = {x["element"]: start_prices[x["element"]] for x in first_gw_data["picks"]}
+    itb = 1000 - sum(squad.values())
+
+    for t in transfers:
+        if t["event"] in fh_gws:
+            continue
+        itb += t["element_out_cost"]
+        itb -= t["element_in_cost"]
+        if t["element_in"]:
+            squad[t["element_in"]] = t["element_in_cost"]
+        if t["element_out"] and t["element_out"] in squad:
+            del squad[t["element_out"]]
+
+    fts = calculate_fts(transfers, first_gw, next_gw, fh_gws, wc_gws)
+
+    picks = []
+    for player_id, purchase_price in squad.items():
+        now_cost = next(
+            x["now_cost"] for x in static["elements"] if x["id"] == player_id
+        )
+        diff = now_cost - purchase_price
+        selling_price = purchase_price + (diff // 2) if diff > 0 else now_cost
+
+        picks.append(
+            {
+                "id": player_id,
+                "purchase_price": purchase_price / 10.0,
+                "selling_price": selling_price / 10.0,
+                "now_cost": now_cost / 10.0,
+            }
+        )
+
+    return {"in_the_bank": itb / 10.0, "free_transfers": fts, "squad": picks}

frontend/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

frontend/README.md

@@ -0,0 +1,16 @@
+# React + Vite
+
+This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+
+Currently, two official plugins are available:
+
+- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Oxc](https://oxc.rs)
+- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/)
+
+## React Compiler
+
+The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
+
+## Expanding the ESLint configuration
+
+If you are developing a production application, we recommend using TypeScript with type-aware lint rules enabled. Check out the [TS template](https://github.com/vitejs/vite/tree/main/packages/create-vite/template-react-ts) for information on how to integrate TypeScript and [`typescript-eslint`](https://typescript-eslint.io) in your project.

frontend/eslint.config.js

@@ -0,0 +1,29 @@
+import js from '@eslint/js'
+import globals from 'globals'
+import reactHooks from 'eslint-plugin-react-hooks'
+import reactRefresh from 'eslint-plugin-react-refresh'
+import { defineConfig, globalIgnores } from 'eslint/config'
+
+export default defineConfig([
+  globalIgnores(['dist']),
+  {
+    files: ['**/*.{js,jsx}'],
+    extends: [
+      js.configs.recommended,
+      reactHooks.configs.flat.recommended,
+      reactRefresh.configs.vite,
+    ],
+    languageOptions: {
+      ecmaVersion: 2020,
+      globals: globals.browser,
+      parserOptions: {
+        ecmaVersion: 'latest',
+        ecmaFeatures: { jsx: true },
+        sourceType: 'module',
+      },
+    },
+    rules: {
+      'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
+    },
+  },
+])

frontend/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image.png" href="/image.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <title>Luigi's Mansion</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>

frontend/package.json

@@ -0,0 +1,41 @@
+{
+  "name": "frontend",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "lint": "eslint .",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
+    "@react-oauth/google": "^0.13.4",
+    "@tailwindcss/postcss": "^4.2.2",
+    "@tanstack/react-table": "^8.21.3",
+    "clsx": "^2.1.1",
+    "framer-motion": "^12.38.0",
+    "lucide-react": "^1.6.0",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
+    "recharts": "^3.8.1",
+    "tailwind-merge": "^3.5.0"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.39.4",
+    "@types/react": "^19.2.14",
+    "@types/react-dom": "^19.2.3",
+    "@vitejs/plugin-react": "^6.0.1",
+    "autoprefixer": "^10.4.27",
+    "eslint": "^9.39.4",
+    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react-refresh": "^0.5.2",
+    "globals": "^17.4.0",
+    "postcss": "^8.5.8",
+    "tailwindcss": "^3.4.19",
+    "vite": "^8.0.1"
+  }
+}

frontend/postcss.config.js

@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+}

frontend/src/App.css

@@ -0,0 +1,184 @@
+.counter {
+  font-size: 16px;
+  padding: 5px 10px;
+  border-radius: 5px;
+  color: var(--accent);
+  background: var(--accent-bg);
+  border: 2px solid transparent;
+  transition: border-color 0.3s;
+  margin-bottom: 24px;
+
+  &:hover {
+    border-color: var(--accent-border);
+  }
+  &:focus-visible {
+    outline: 2px solid var(--accent);
+    outline-offset: 2px;
+  }
+}
+
+.hero {
+  position: relative;
+
+  .base,
+  .framework,
+  .vite {
+    inset-inline: 0;
+    margin: 0 auto;
+  }
+
+  .base {
+    width: 170px;
+    position: relative;
+    z-index: 0;
+  }
+
+  .framework,
+  .vite {
+    position: absolute;
+  }
+
+  .framework {
+    z-index: 1;
+    top: 34px;
+    height: 28px;
+    transform: perspective(2000px) rotateZ(300deg) rotateX(44deg) rotateY(39deg)
+      scale(1.4);
+  }
+
+  .vite {
+    z-index: 0;
+    top: 107px;
+    height: 26px;
+    width: auto;
+    transform: perspective(2000px) rotateZ(300deg) rotateX(40deg) rotateY(39deg)
+      scale(0.8);
+  }
+}
+
+#center {
+  display: flex;
+  flex-direction: column;
+  gap: 25px;
+  place-content: center;
+  place-items: center;
+  flex-grow: 1;
+
+  @media (max-width: 1024px) {
+    padding: 32px 20px 24px;
+    gap: 18px;
+  }
+}
+
+#next-steps {
+  display: flex;
+  border-top: 1px solid var(--border);
+  text-align: left;
+
+  & > div {
+    flex: 1 1 0;
+    padding: 32px;
+    @media (max-width: 1024px) {
+      padding: 24px 20px;
+    }
+  }
+
+  .icon {
+    margin-bottom: 16px;
+    width: 22px;
+    height: 22px;
+  }
+
+  @media (max-width: 1024px) {
+    flex-direction: column;
+    text-align: center;
+  }
+}
+
+#docs {
+  border-right: 1px solid var(--border);
+
+  @media (max-width: 1024px) {
+    border-right: none;
+    border-bottom: 1px solid var(--border);
+  }
+}
+
+#next-steps ul {
+  list-style: none;
+  padding: 0;
+  display: flex;
+  gap: 8px;
+  margin: 32px 0 0;
+
+  .logo {
+    height: 18px;
+  }
+
+  a {
+    color: var(--text-h);
+    font-size: 16px;
+    border-radius: 6px;
+    background: var(--social-bg);
+    display: flex;
+    padding: 6px 12px;
+    align-items: center;
+    gap: 8px;
+    text-decoration: none;
+    transition: box-shadow 0.3s;
+
+    &:hover {
+      box-shadow: var(--shadow);
+    }
+    .button-icon {
+      height: 18px;
+      width: 18px;
+    }
+  }
+
+  @media (max-width: 1024px) {
+    margin-top: 20px;
+    flex-wrap: wrap;
+    justify-content: center;
+
+    li {
+      flex: 1 1 calc(50% - 8px);
+    }
+
+    a {
+      width: 100%;
+      justify-content: center;
+      box-sizing: border-box;
+    }
+  }
+}
+
+#spacer {
+  height: 88px;
+  border-top: 1px solid var(--border);
+  @media (max-width: 1024px) {
+    height: 48px;
+  }
+}
+
+.ticks {
+  position: relative;
+  width: 100%;
+
+  &::before,
+  &::after {
+    content: '';
+    position: absolute;
+    top: -4.5px;
+    border: 5px solid transparent;
+  }
+
+  &::before {
+    left: 0;
+    border-left-color: var(--border);
+  }
+  &::after {
+    right: 0;
+    border-right-color: var(--border);
+  }
+}

frontend/src/App.jsx

@@ -0,0 +1,280 @@
+import React, { useState, useContext, useEffect } from "react";
+import { motion, AnimatePresence } from "framer-motion";
+import {
+  Activity,
+  BarChart2,
+  Shield,
+  Calendar,
+  Zap,
+  LogIn,
+  Settings,
+  X,
+} from "lucide-react";
+
+import { LandingPage } from "./components/LandingPage";
+import ProjectionsTable from "./components/ProjectionsTable";
+import AccuracyDashboard from "./components/AccuracyDashboard";
+import TeamRatings from "./components/TeamRatings";
+import Fixtures from "./components/Fixtures";
+import Solver from "./components/Solver";
+import LoginModal from "./components/LoginModal";
+import { PlayerProvider, PlayerContext } from "./PlayerContext";
+
+
+const tabs = [
+  { id: "solver", label: "Solver", icon: Zap },
+  { id: "projections", label: "Projections", icon: Activity },
+  { id: "accuracy", label: "Accuracy", icon: BarChart2 },
+  { id: "ratings", label: "Team Ratings", icon: Shield },
+  { id: "fixtures", label: "Fixtures", icon: Calendar },
+];
+
+function AppContent() {
+  const [activeTab, setActiveTab] = useState(tabs[0].id);
+  const [showLoginModal, setShowLoginModal] = useState(false);
+  const [showSettings, setShowSettings] = useState(false);
+
+  const {
+    isLoggedIn,
+    setIsLoggedIn,
+    userProfile,
+    setUserProfile,
+    hasGuestMadeEdits,
+    setHasGuestMadeEdits,
+    isCheckingAuth, // <-- Pull in the new state
+  } = useContext(PlayerContext);
+
+  const [newDefaultId, setNewDefaultId] = useState("");
+  const [isSaved, setIsSaved] = useState(false);
+
+  // Sync local input with context profile
+  useEffect(() => {
+    if (userProfile?.defaultTeamId) {
+      setNewDefaultId(userProfile.defaultTeamId);
+    }
+  }, [userProfile]);
+
+  const handleUpdateDefaultId = () => {
+    const parsedId = parseInt(newDefaultId);
+    if (!parsedId) return;
+
+    const token = localStorage.getItem('fpl_token');
+    if (token) {
+      fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+        body: JSON.stringify({ default_team_id: parsedId })
+      }).then(() => {
+        setUserProfile(prev => ({ ...prev, defaultTeamId: parsedId }));
+        setIsSaved(true);
+        setTimeout(() => setIsSaved(false), 2000);
+      });
+    }
+  };
+
+  // --- THE NEW LOADING INTERCEPTOR ---
+  // If we are actively checking the token, show a sleek loading screen instead of the landing page
+  if (isCheckingAuth) {
+    return (
+      <div className="min-h-screen bg-slate-950 flex flex-col items-center justify-center">
+        <div className="w-12 h-12 border-4 border-slate-800 border-t-luigi-500 rounded-full animate-spin"></div>
+        <p className="mt-4 text-luigi-400 font-bold tracking-widest uppercase text-xs animate-pulse">Entering Mansion...</p>
+      </div>
+    );
+  }
+
+  // If we finished checking and they definitely aren't logged in, show the gatekeeper
+  if (!isLoggedIn) {
+    return <LandingPage />;
+  }
+
+  const handleLogout = () => {
+    localStorage.removeItem("fpl_token");
+    setIsLoggedIn(false);
+    setUserProfile({ username: "Guest", defaultTeamId: null, isAdmin: false });
+    setShowSettings(false);
+    setActiveTab("solver"); // <-- Forces the app back to the Team ID loading page!
+  };
+
+  return (
+    <div className="min-h-screen bg-slate-950 text-slate-200 font-sans selection:bg-luigi-500/30">
+      <header className="border-b border-slate-800 bg-slate-950/80 backdrop-blur-md sticky top-0 z-50 shadow-sm">
+        <div className="max-w-[1600px] w-full mx-auto px-4 sm:px-6 lg:px-8 py-4 flex flex-col md:flex-row md:items-center justify-between gap-4">
+          {/* THE RESTORED TITLE */}
+          <div
+            onClick={() => setActiveTab("solver")}
+            className="flex items-center gap-3 cursor-pointer hover:opacity-80 transition-opacity"
+          >
+            <img
+              src="/l-logo.png"
+              alt="Luigi's Mansion Logo"
+              className="w-8 h-8 object-contain drop-shadow-[0_0_12px_rgba(16,185,129,0.5)]"
+            />
+            <h1 className="text-2xl font-black text-transparent bg-clip-text bg-gradient-to-r from-emerald-400 to-cyan-500 tracking-tight whitespace-nowrap">
+              Luigi's Mansion
+            </h1>
+          </div>
+
+          <nav className="flex space-x-1 overflow-x-auto pb-2 md:pb-0 hide-scrollbar">
+            {tabs.map((tab) => {
+              const Icon = tab.icon;
+              return (
+                <button
+                  key={tab.id}
+                  onClick={() => setActiveTab(tab.id)}
+                  className={`flex items-center px-4 py-2.5 rounded-lg text-sm font-semibold whitespace-nowrap transition-all duration-200 ease-in-out ${activeTab === tab.id ? "bg-luigi-500/10 text-luigi-400 shadow-[inset_0_-2px_0_rgba(16,185,129,1)]" : "text-slate-400 hover:text-slate-200 hover:bg-slate-800/50"}`}
+                >
+                  <Icon className="w-4 h-4 mr-2" />
+                  {tab.label}
+                </button>
+              );
+            })}
+          </nav>
+
+          <div className="flex items-center gap-4 mt-4 md:mt-0 relative">
+            {isLoggedIn ? (
+              <div className="flex items-center gap-3 relative">
+                <div className="flex flex-col text-right">
+                  <div className="flex items-center gap-1.5 justify-end">
+                    {userProfile.isAdmin && (
+                      <Shield
+                        size={14}
+                        className="text-yellow-500"
+                        title="Admin Mode"
+                      />
+                    )}
+                    <span className="text-sm font-bold text-slate-200">
+                      {userProfile.username}
+                    </span>
+                  </div>
+                </div>
+
+                <button
+                  onClick={() => setShowSettings(!showSettings)}
+                  className="p-2 bg-slate-900 border border-slate-700 rounded-full hover:bg-slate-800 hover:border-luigi-500 hover:text-luigi-400 transition-colors shadow-sm"
+                >
+                  <Settings size={18} />
+                </button>
+
+                {showSettings && (
+                  <div className="absolute top-full right-0 mt-2 w-72 bg-slate-900 border border-slate-700 rounded-xl shadow-2xl p-4 z-50 animate-in fade-in slide-in-from-top-2 flex flex-col gap-4">
+
+                    {/* Default ID Setting */}
+                    <div>
+                      <h4 className="text-[10px] font-black text-slate-500 uppercase tracking-wider mb-2">
+                        Default FPL ID
+                      </h4>
+                      <div className="flex items-center gap-2">
+                        <input
+                          type="number"
+                          value={newDefaultId}
+                          onChange={(e) => setNewDefaultId(e.target.value)}
+                          placeholder="e.g. 123456"
+                          className="bg-slate-950 border border-slate-700 rounded py-1.5 px-3 text-xs font-bold text-slate-200 outline-none focus:border-luigi-500 flex-1 shadow-inner"
+                        />
+                        <button
+                          onClick={handleUpdateDefaultId}
+                          className={`px-3 py-1.5 rounded text-xs font-bold transition-all shadow-md ${isSaved
+                              ? 'bg-luigi-500 text-slate-950'
+                              : 'bg-slate-800 hover:bg-slate-700 border border-slate-600 text-white active:scale-95'
+                            }`}
+                        >
+                          {isSaved ? 'Saved ✓' : 'Save'}
+                        </button>
+                      </div>
+                    </div>
+
+                    <div className="h-px w-full bg-slate-800"></div>
+
+                    <button
+                      onClick={handleLogout}
+                      className="w-full text-left px-3 py-2 text-sm font-bold text-red-400 hover:bg-slate-800 hover:text-red-300 rounded-lg transition-colors flex items-center justify-between"
+                    >
+                      <span>Log Out</span>
+                      <LogIn size={14} className="rotate-180 opacity-50" />
+                    </button>
+                  </div>
+                )}
+              </div>
+            ) : (
+              <div className="relative">
+                <button
+                  onClick={() => setShowLoginModal(true)}
+                  className="flex items-center gap-2 px-4 py-2 bg-slate-900 border border-slate-700 hover:border-luigi-500 rounded-lg text-sm font-bold text-slate-300 hover:text-luigi-400 transition-colors shadow-sm"
+                >
+                  <LogIn size={16} /> Log In
+                </button>
+
+                {hasGuestMadeEdits && (
+                  <div className="absolute top-full right-0 mt-3 w-64 bg-slate-900 border border-luigi-500/50 shadow-[0_0_20px_rgba(16,185,129,0.15)] rounded-xl p-4 animate-in fade-in slide-in-from-top-4 z-50">
+                    <button
+                      onClick={() => setHasGuestMadeEdits(false)}
+                      className="absolute top-2 right-2 text-slate-500 hover:text-slate-300 transition-colors"
+                    >
+                      <X size={14} />
+                    </button>
+                    <div className="flex items-start gap-3">
+                      <div className="text-xl">💡</div>
+                      <p className="text-xs font-medium text-slate-300 leading-tight">
+                        You've made custom adjustments!{" "}
+                        <span
+                          className="text-luigi-400 font-bold cursor-pointer hover:underline"
+                          onClick={() => setShowLoginModal(true)}
+                        >
+                          Log in
+                        </span>{" "}
+                        to save your session.
+                      </p>
+                    </div>
+                    <div className="absolute -top-2 right-6 w-4 h-4 bg-slate-900 border-t border-l border-luigi-500/50 transform rotate-45"></div>
+                  </div>
+                )}
+              </div>
+            )}
+          </div>
+        </div>
+      </header>
+
+      <main className="max-w-[1600px] w-full mx-auto px-4 sm:px-6 lg:px-8 py-6 sm:py-8">
+        {/* Solver is always mounted so local state (snapshot, pairs, highlights) survives tab switches */}
+        <div
+          className={activeTab !== "solver" ? "hidden" : ""}
+          aria-hidden={activeTab !== "solver"}
+        >
+          <Solver />
+        </div>
+
+        {/* Every other tab is animated and only rendered when active */}
+        {activeTab !== "solver" && (
+          <AnimatePresence mode="wait">
+            <motion.div
+              key={activeTab}
+              initial={{ opacity: 0, y: 10 }}
+              animate={{ opacity: 1, y: 0 }}
+              exit={{ opacity: 0, y: -10 }}
+              transition={{ duration: 0.2 }}
+            >
+              {activeTab === "projections" && <ProjectionsTable />}
+              {activeTab === "accuracy" && <AccuracyDashboard />}
+              {activeTab === "ratings" && <TeamRatings />}
+              {activeTab === "fixtures" && <Fixtures />}
+            </motion.div>
+          </AnimatePresence>
+        )}
+      </main>
+
+      <LoginModal
+        isOpen={showLoginModal}
+        onClose={() => setShowLoginModal(false)}
+      />
+    </div>
+  );
+}
+
+export default function App() {
+  return (
+    <PlayerProvider>
+      <AppContent />
+    </PlayerProvider>
+  );
+}

frontend/src/PlayerContext.jsx

@@ -0,0 +1,572 @@
+// src/PlayerContext.jsx
+import React, { createContext, useState, useEffect, useRef, useCallback, useMemo } from 'react';
+
+export const PlayerContext = createContext();
+
+export const PlayerProvider = ({ children }) => {
+  const globalFixturesRef = useRef({});
+  const [originalPlayers, setOriginalPlayers] = useState([]); 
+  const [globalPlayers, setGlobalPlayers] = useState([]);
+  const [globalFixtures, setGlobalFixtures] = useState({});
+  const [isLoadingDB, setIsLoadingDB] = useState(true);
+
+  const [teamId, setTeamId] = useState('');
+  const [availableGWs, setAvailableGWs] = useState([]);
+  const [itb, setItb] = useState(0); 
+  const [availableFts, setAvailableFts] = useState(1);
+  const [initialSquadIds, setInitialSquadIds] = useState([]);
+  const [solverResult, setSolverResult] = useState(null);
+  const [activeChip, setActiveChip] = useState(null);
+  const [solveElapsedSec, setSolveElapsedSec] = useState(0);
+  const [numSims, setNumSims] = useState(100);
+  const HIT_COST = 4;
+
+  const [baselineItb, setBaselineItb] = useState(0);
+  const [baselineFt, setBaselineFt] = useState(1);
+  const [comprehensiveSettings, setComprehensiveSettings] = useState({});
+  const [globalXmins, setGlobalXmins] = useState({});
+  
+  
+  const [quickSettings, setQuickSettings] = useState({
+    decay: 0.85,
+    ft_value: 1.5,
+    iterations: 1,
+    banned: [],
+    locked: [],
+  });
+  
+  const [advancedSettings, setAdvancedSettings] = useState({
+    hit_cost: 4,
+    itb_value: 0.08,
+    max_per_team: 3,
+    vice_weight: 0.05,
+    time_limit_sec: 30,
+    no_transfer_last_gws: 0
+  });
+
+  // FIXED: FPL 24/25 FT Rollover Logic
+  const ftAtStartOfGw = (targetGw, gwsArray, baseFt, trByGw, chByGw) => {
+    if (!gwsArray || !gwsArray.length) return baseFt;
+    let ft = baseFt;
+    for (let gw = gwsArray[0]; gw < targetGw; gw++) {
+      const chip = chByGw[gw];
+      if (chip === 'wc' || chip === 'fh') {
+        ft = Math.min(5, ft);
+      } else {
+        const used = trByGw[gw]?.count || 0;
+        ft = Math.min(5, Math.max(0, ft - used) + 1);
+      }
+    }
+    return Math.max(1, Math.min(5, ft));
+  };
+
+  const itbAtStartOfGw = (targetGw, gwsArray, baseItb, trByGw) => {
+    let currentItb = baseItb;
+    if (!gwsArray || !gwsArray.length) return currentItb;
+    for (let gw = gwsArray[0]; gw < targetGw; gw++) {
+      currentItb += (trByGw[gw]?.netDelta || 0);
+    }
+    return currentItb;
+  };
+
+  // =========================================================
+  // --- MULTIVERSE DRAFTS ENGINE (Phase 1) ---
+  // =========================================================
+  const [drafts, setDrafts] = useState([{
+    id: "main_1",
+    name: "Main Timeline",
+    teamData: [],
+    horizon: 5,
+    activeGW: null,
+    captainId: null,
+    viceId: null,
+    solverTransferPairs: {},
+    solverApplySnapshot: null,
+    appliedPlanSummary: null,
+    hitsThisGw: 0,
+    highlightTransferIds: {},
+    transfersByGw: {},
+    chipsByGw: {},
+    manualOverrides: {},
+    fixtureOverrides: {}, // <-- ADDED: Isolated Fixtures
+    sessionEdits: {}      // <-- ADDED: Isolated Minutes
+  }]);
+  
+  const [activeDraftId, setActiveDraftId] = useState("main_1");
+
+  // 1. EXTRACT CURRENT REALITY
+  const activeDraft = drafts.find(d => d.id === activeDraftId) || drafts[0];
+
+  const teamData = activeDraft.teamData;
+  const horizon = activeDraft.horizon;
+  const activeGW = activeDraft.activeGW;
+  const captainId = activeDraft.captainId;
+  const viceId = activeDraft.viceId;
+  const solverTransferPairs = activeDraft.solverTransferPairs || {};
+  const solverApplySnapshot = activeDraft.solverApplySnapshot;
+  const appliedPlanSummary = activeDraft.appliedPlanSummary;
+  const hitsThisGw = activeDraft.hitsThisGw;
+  const highlightTransferIds = activeDraft.highlightTransferIds || {};
+  const transfersByGw = activeDraft.transfersByGw || {};
+  const chipsByGw = activeDraft.chipsByGw || {};
+  
+  // Safe extraction fallbacks for older local cache hits
+  const manualOverrides = activeDraft.manualOverrides || {};
+  const fixtureOverrides = activeDraft.fixtureOverrides || {};
+  const sessionEdits = activeDraft.sessionEdits || {};
+
+  const effectiveFixtures = useMemo(() => {
+      return { ...globalFixtures, ...(fixtureOverrides || {}) };
+  }, [globalFixtures, fixtureOverrides]);
+
+  // 2. PROXY SETTERS (Intercepts state calls and routes them to the active draft)
+  const updateDraftState = useCallback((key, newValue) => {
+    setDrafts(prevDrafts => {
+      const activeIndex = prevDrafts.findIndex(d => d.id === activeDraftId);
+      if (activeIndex === -1) return prevDrafts;
+
+      const draft = prevDrafts[activeIndex];
+      // Provide an empty object fallback for expected object states to prevent functional crashes
+      const currentValue = draft[key] !== undefined ? draft[key] : (key === 'teamData' || key === 'availableGWs' ? [] : {});
+      const evaluatedValue = typeof newValue === 'function' ? newValue(currentValue) : newValue;
+
+      const newDrafts = [...prevDrafts];
+      newDrafts[activeIndex] = { ...draft, [key]: evaluatedValue };
+      return newDrafts;
+    });
+  }, [activeDraftId]);
+
+  const setTeamData = useCallback((val) => updateDraftState("teamData", val), [updateDraftState]);
+  const setHorizon = useCallback((val) => updateDraftState("horizon", val), [updateDraftState]);
+  const setActiveGW = useCallback((val) => updateDraftState("activeGW", val), [updateDraftState]);
+  const setCaptainId = useCallback((val) => updateDraftState("captainId", val), [updateDraftState]);
+  const setViceId = useCallback((val) => updateDraftState("viceId", val), [updateDraftState]);
+  const setSolverTransferPairs = useCallback((val) => updateDraftState("solverTransferPairs", val), [updateDraftState]);
+  const setSolverApplySnapshot = useCallback((val) => updateDraftState("solverApplySnapshot", val), [updateDraftState]);
+  const setAppliedPlanSummary = useCallback((val) => updateDraftState("appliedPlanSummary", val), [updateDraftState]);
+  const setHitsThisGw = useCallback((val) => updateDraftState("hitsThisGw", val), [updateDraftState]);
+  const setHighlightTransferIds = useCallback((val) => updateDraftState("highlightTransferIds", val), [updateDraftState]);
+  const setTransfersByGw = useCallback((val) => updateDraftState("transfersByGw", val), [updateDraftState]);
+  const setChipsByGw = useCallback((val) => updateDraftState("chipsByGw", val), [updateDraftState]);
+  const setFixtureOverrides = useCallback((val) => updateDraftState("fixtureOverrides", val), [updateDraftState]); // <-- GHOST PATCH
+  const setSessionEdits = useCallback((val) => updateDraftState("sessionEdits", val), [updateDraftState]);         // <-- GHOST PATCH
+  // =========================================================
+
+  const manualOverridesRef = useRef(manualOverrides);
+  useEffect(() => { manualOverridesRef.current = manualOverrides; }, [manualOverrides]);
+
+  const [projSearchTerm, setProjSearchTerm] = useState('');
+  const sessionEditsRef = useRef(sessionEdits);
+  useEffect(() => { sessionEditsRef.current = sessionEdits; }, [sessionEdits]);
+
+  const [isLoggedIn, setIsLoggedIn] = useState(false); 
+  const [isCheckingAuth, setIsCheckingAuth] = useState(true);
+  const [userProfile, setUserProfile] = useState({ username: "Guest", defaultTeamId: null, isAdmin: false });
+  const [hasGuestMadeEdits, setHasGuestMadeEdits] = useState(false);
+  const [pendingWorkspaceLoad, setPendingWorkspaceLoad] = useState(null);
+
+  // Custom proxy setter for manualOverrides to retain your exact Auth saving logic
+  const setManualOverrides = useCallback((updater) => {
+    updateDraftState("manualOverrides", (prev) => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      const token = localStorage.getItem('fpl_token');
+      if (token) {
+        fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+          body: JSON.stringify({ saved_edits: { ...sessionEditsRef.current, _solver_overrides: next } })
+        });
+      }
+      return next;
+    });
+  }, [updateDraftState]);
+
+  const saveSession = (overrides) => {
+    const token = localStorage.getItem('fpl_token');
+    if (token) {
+      fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+        body: JSON.stringify({ 
+          saved_edits: { ...sessionEditsRef.current, _solver_overrides: overrides },
+          drafts: drafts 
+        })
+      });
+    }
+  };
+
+  useEffect(() => {
+    // YOUR EXACT PROJECTIONS API ENDPOINT RESTORED
+    fetch('https://anayshukla-fpl-solver.hf.space/api/projections')
+      .then(res => { if (!res.ok) throw new Error("DB Error"); return res.json(); })
+      .then(data => { 
+        setOriginalPlayers(JSON.parse(JSON.stringify(data))); 
+        setGlobalPlayers(data); 
+        setIsLoadingDB(false); 
+      })
+      .catch(err => setIsLoadingDB(false));
+
+    // THE FIX: Store global fixtures in the Ref so the Auth wipe doesn't delete them!
+    fetch('https://anayshukla-fpl-solver.hf.space/api/fixtures/overrides')
+      .then(res => res.ok ? res.json() : {})
+      .then(data => {
+         if (Object.keys(data).length > 0) setGlobalFixtures(data); 
+      })
+      .catch(err => console.error("Failed to load global fixtures:", err));
+
+    fetch('https://anayshukla-fpl-solver.hf.space/api/xmins/overrides')
+      .then(res => res.ok ? res.json() : {})
+      .then(data => { if (Object.keys(data).length > 0) setGlobalXmins(data); })
+      .catch(err => console.error("Failed to load global xMins:", err));
+  }, []);
+
+  useEffect(() => {
+    const token = localStorage.getItem('fpl_token');
+    if (token) {
+      fetch('https://anayshukla-fpl-solver.hf.space/api/auth/me', { headers: { 'Authorization': `Bearer ${token}` } })
+      .then(res => res.json())
+      .then(data => {
+        if (data.email) {
+          setUserProfile({ username: data.email.split('@')[0], defaultTeamId: data.default_team_id, isAdmin: data.is_admin });
+          
+          // THE FIX: Inject the Multiverse realities from the database!
+          if (data.drafts && data.drafts.length > 0) {
+             setDrafts(data.drafts);
+             const saved = data.saved_edits || {};
+             if (saved._active_draft_id && data.drafts.some(d => d.id === saved._active_draft_id)) {
+                 setActiveDraftId(saved._active_draft_id);
+             } else {
+                 setActiveDraftId(data.drafts[0].id);
+             }
+          }
+
+          const saved = data.saved_edits || {};
+          if (saved._solver_overrides) {
+             setManualOverrides(saved._solver_overrides);
+             delete saved._solver_overrides;
+          }
+          if (saved._workspace) {
+             setPendingWorkspaceLoad(saved._workspace);
+             delete saved._workspace;
+          }
+          setSessionEdits(saved);
+          setIsLoggedIn(true);
+          if (data.default_team_id) setTeamId(String(data.default_team_id));
+        } else {
+          localStorage.removeItem('fpl_token');
+          setSessionEdits({});
+          setManualOverrides({});
+          setTeamId('');
+          setTeamData([]);
+        }
+      }).catch(() => {
+        localStorage.removeItem('fpl_token');
+        setSessionEdits({});
+        setManualOverrides({});
+        setTeamId('');
+        setTeamData([]);
+      }).finally(() => {
+        setIsCheckingAuth(false);
+      });
+    } else {
+      setSessionEdits({});
+      setManualOverrides({});
+      setTeamId('');
+      setTeamData([]);
+      setIsCheckingAuth(false); 
+    }
+  }, [isLoggedIn]);
+
+  useEffect(() => {
+    if (originalPlayers.length > 0) {
+      setGlobalPlayers(prev => {
+        const newPlayers = JSON.parse(JSON.stringify(originalPlayers));
+
+        // --- 1. THE STOCHASTIC FIXTURE ENGINE ---
+        newPlayers.forEach(p => {
+           if (p.match_projections) {
+               // A. Zero out old stats + Track probability sum for averaging
+               const gwKeys = Object.keys(p).filter(k => k.includes('_Pts')).map(k => k.split('_')[0]);
+               gwKeys.forEach(gw => {
+                   p[`${gw}_Pts`] = 0; p[`${gw}_xMins`] = 0; p[`${gw}_xG`] = 0; p[`${gw}_xA`] = 0; p[`${gw}_CS`] = 0;
+                   p[`${gw}_probSum`] = 0; // NEW: Tracks total matches in this GW
+               });
+
+               // B. Loop matches and apply Match-Level Minute Edits
+               const manualBaseline = sessionEdits[p.ID]?.baseline_xMins;
+               const origBaseline = p.baseline_xMins || 90;
+               const baselineScale = (manualBaseline != null && origBaseline > 0) ? (Number(manualBaseline) / origBaseline) : 1.0;
+
+               Object.entries(p.match_projections).forEach(([matchId, mData]) => {
+                   const override = effectiveFixtures[matchId];;
+                   
+                   let manualMins = sessionEdits[p.ID]?.[`${matchId}_xMins`];
+                   let globalMatchMins = globalXmins[p.ID]?.[matchId];
+
+                   if (manualMins === undefined) {
+                       if (globalMatchMins !== undefined) {
+                           manualMins = globalMatchMins;
+                       } else {
+                           let activeGw = override ? Object.keys(override).find(g => override[g] > 0) : mData.default_gw;
+                           if (activeGw) manualMins = sessionEdits[p.ID]?.[`${activeGw}_xMins`] ?? globalXmins?.[p.ID]?.[activeGw];
+                       }
+                   }
+                   
+                   // THE FIX: Apply match edit, OR dynamically scale by the baseline edit!
+                   const activeMins = manualMins != null 
+                        ? Number(manualMins) 
+                        : Math.min((mData.xMins * baselineScale), 90);
+                   
+                   // Scale the match EV based on the active minutes
+                   const scaling = (activeMins > 0 && mData.xMins > 0) ? (activeMins / mData.xMins) : 0;
+                   const aPts = mData.Pts * scaling;
+                   const axG = mData.xG * scaling;
+                   const axA = mData.xA * scaling;
+                   const aCS = mData.CS * scaling;
+
+                   // C. Distribute the scaled EV
+                   if (override) {
+                       Object.entries(override).forEach(([gwStr, prob]) => {
+                           const gw = gwStr;
+                           p[`${gw}_Pts`] += (aPts * prob);
+                           p[`${gw}_xMins`] += (activeMins * prob);
+                           p[`${gw}_probSum`] += prob; // Add probability to the GW sum
+                           p[`${gw}_xG`] += (axG * prob); p[`${gw}_xA`] += (axA * prob); p[`${gw}_CS`] += (aCS * prob);
+                       });
+                   } else {
+                       const gw = mData.default_gw;
+                       p[`${gw}_Pts`] += aPts;
+                       p[`${gw}_xMins`] += activeMins;
+                       p[`${gw}_probSum`] += 1.0;
+                       p[`${gw}_xG`] += axG; p[`${gw}_xA`] += axA; p[`${gw}_CS`] += aCS;
+                   }
+               });
+
+               // D. Calculate FPL Average xMins
+               gwKeys.forEach(gw => {
+                   if (p[`${gw}_probSum`] > 0) {
+                       p[`${gw}_xMins`] = Math.round(p[`${gw}_xMins`] / p[`${gw}_probSum`]);
+                   }
+               });
+           }
+        });
+
+        // --- 2. APPLY MANUAL SESSION EDITS (Overwrites everything) ---
+        if (Object.keys(sessionEdits).length > 0) {
+            Object.keys(sessionEdits).forEach(playerId => {
+              if (playerId === '_solver_overrides') return; 
+              
+              const pid = parseInt(playerId);
+              const pIdx = newPlayers.findIndex(p => p.ID === pid);
+              if (pIdx > -1) {
+                const edits = sessionEdits[playerId];
+                Object.keys(edits).forEach(editKey => {
+                  newPlayers[pIdx][editKey] = edits[editKey];
+                  if (editKey.includes('_xMins') && !editKey.includes('_vs_')) {
+                    const gw = editKey.split('_')[0];
+                    if (edits[`${gw}_Pts`] === undefined) {
+                      const baseMins = originalPlayers[pIdx][`${gw}_xMins`] || 90;
+                      const basePts = originalPlayers[pIdx][`${gw}_Pts`] || 0;
+                      newPlayers[pIdx][`${gw}_Pts`] = baseMins > 0 ? (basePts / baseMins) * edits[editKey] : 0;
+                    }
+                  }
+                });
+              }
+            });
+        }
+        
+        return newPlayers;
+      });
+    }
+  }, [originalPlayers, isLoggedIn, sessionEdits, effectiveFixtures]);
+
+  useEffect(() => {
+    if (!isLoggedIn || isLoadingDB || globalPlayers.length === 0) return;
+    
+    const timeout = setTimeout(() => {
+      const workspace = {
+        teamData: teamData.map(p => ({ ID: p.ID, Price: p.Price, isBlank: p.isBlank, replacedPlayer: p.replacedPlayer })),
+        horizon,
+        activeGW,
+        baselineItb,
+        baselineFt,
+        transfersByGw,
+        chipsByGw,
+        quickSettings,
+        advancedSettings,
+        highlightTransferIds: Object.fromEntries(Object.entries(highlightTransferIds).map(([k,v]) => [k, Array.from(v)])),
+        solverTransferPairs
+      };
+      
+      const token = localStorage.getItem('fpl_token');
+      if (token) {
+        fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+          body: JSON.stringify({ 
+             saved_edits: { 
+                 ...sessionEditsRef.current, 
+                 _solver_overrides: manualOverridesRef.current, 
+                 _workspace: workspace,
+                 _active_draft_id: activeDraftId 
+             },
+             drafts: drafts // <-- THE FIX: Package and send the entire Multiverse!
+          })
+        });
+      }
+    }, 500); 
+    // THE FIX: Added 'drafts' to the end of this dependency array so edits trigger the save
+  }, [teamData, horizon, activeGW, baselineItb, baselineFt, transfersByGw, chipsByGw, quickSettings, advancedSettings, highlightTransferIds, solverTransferPairs, isLoggedIn, isLoadingDB, globalPlayers, drafts]);
+
+  useEffect(() => {
+    if (globalPlayers.length === 0 || teamData.length === 0) return;
+
+    setTeamData(prevTeam => {
+      let needsUpdate = false;
+      
+      const syncedTeam = prevTeam.map(tp => {
+        const gp = globalPlayers.find(p => p.ID === tp.ID);
+        if (!gp) return tp;
+
+        // If the squad's math is out of sync with the global math, flag it for an update!
+        // (We check a few sample gameweeks to guarantee we catch the mismatch)
+        if (
+          tp['1_Pts'] !== gp['1_Pts'] || 
+          tp['19_Pts'] !== gp['19_Pts'] || 
+          tp['38_Pts'] !== gp['38_Pts'] || 
+          tp.baseline_xMins !== gp.baseline_xMins
+        ) {
+          needsUpdate = true;
+          return { ...tp, ...gp, Price: tp.Price }; // Merges the math, but protects your specific Selling Price!
+        }
+        return tp;
+      });
+
+      // Only triggers a re-render if it actually found stale data
+      return needsUpdate ? syncedTeam : prevTeam;
+    });
+  }, [globalPlayers, teamData, setTeamData]);
+
+  const updatePlayerStat = (playerId, gw, statKey, rawValue) => {
+    let finalValue = statKey === 'xMins' ? Math.min(Math.max(Number(rawValue), 0), 90) : rawValue;
+    if (!isLoggedIn) setHasGuestMadeEdits(true);
+
+    const pristinePlayer = originalPlayers.find(p => p.ID === playerId);
+    let calculatedPts = 0;
+
+    // 1. Determine the exact original value to see if we are reverting
+    let isRevertingToOriginal = false;
+    const isMatchId = String(gw).includes('_vs_');
+
+    // FIX: Look specifically inside match_projections for DGW match edits!
+    if (pristinePlayer && pristinePlayer.match_projections && isMatchId) {
+        const mData = pristinePlayer.match_projections[gw];
+        if (mData) {
+            const mOrig = statKey === 'xMins' ? mData.xMins : mData[statKey];
+            isRevertingToOriginal = (finalValue === mOrig);
+        }
+    } else {
+        const originalValue = pristinePlayer ? pristinePlayer[`${gw}_${statKey}`] : undefined;
+        if (originalValue !== undefined) {
+          isRevertingToOriginal = (finalValue === originalValue);
+        } else if (statKey === 'xMins' && finalValue === 90) {
+          isRevertingToOriginal = true;
+        }
+    }
+
+    // Calculate instant EV for UI feedback
+    if (statKey === 'xMins') {
+      if (pristinePlayer && pristinePlayer.match_projections && isMatchId) {
+          const mData = pristinePlayer.match_projections[gw];
+          const baseMins = mData ? mData.xMins : 90;
+          const basePts = mData ? mData.Pts : 0;
+          calculatedPts = baseMins > 0 ? (basePts / baseMins) * finalValue : 0;
+      } else {
+          const baseMins = pristinePlayer ? pristinePlayer[`${gw}_xMins`] || 90 : 90;
+          const basePts = pristinePlayer ? pristinePlayer[`${gw}_Pts`] || 0 : 0;
+          calculatedPts = baseMins > 0 ? (basePts / baseMins) * finalValue : 0;
+      }
+    }
+
+    setGlobalPlayers(prev => prev.map(p => {
+      if (p.ID === playerId) {
+        let updated = { ...p, [`${gw}_${statKey}`]: finalValue };
+        if (statKey === 'xMins') updated[`${gw}_Pts`] = calculatedPts;
+        return updated;
+      }
+      return p;
+    }));
+
+    setTeamData(prev => prev.map(p => {
+      if (p.ID === playerId) {
+        let updated = { ...p, [`${gw}_${statKey}`]: finalValue };
+        if (statKey === 'xMins') updated[`${gw}_Pts`] = calculatedPts;
+        return updated;
+      }
+      return p;
+    }));
+
+    // 2. The Smart Self-Cleaning Session Edits
+    setSessionEdits(prev => {
+      const newEdits = { ...prev };
+
+      if (isRevertingToOriginal) {
+        if (newEdits[playerId]) {
+          newEdits[playerId] = { ...newEdits[playerId] };
+          delete newEdits[playerId][`${gw}_${statKey}`];
+          if (statKey === 'xMins') delete newEdits[playerId][`${gw}_Pts`];
+          
+          if (Object.keys(newEdits[playerId]).length === 0) delete newEdits[playerId];
+        }
+      } else {
+        if (!newEdits[playerId]) newEdits[playerId] = {};
+        newEdits[playerId] = { ...newEdits[playerId], [`${gw}_${statKey}`]: finalValue };
+        
+        if (statKey === 'xMins') {
+           // Do not hardcode match points so the stochastic engine can dynamically scale it!
+           if (!isMatchId) newEdits[playerId][`${gw}_Pts`] = calculatedPts;
+        }
+      }
+      
+      if (isLoggedIn) {
+        fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${localStorage.getItem('fpl_token')}` },
+          body: JSON.stringify({ saved_edits: { ...newEdits, _solver_overrides: manualOverridesRef.current } })
+        });
+      }
+      return newEdits;
+    });
+  };
+
+  // --- STOCHASTIC ENGINE INVALIDATION ---
+  // If the user changes any fixture odds, the current solver lineup is now mathematically invalid.
+  // This instantly clears the stale lineup and forces the UI to reset.
+  useEffect(() => {
+    if (solverResult) {
+      setSolverResult(null);
+    }
+    if (appliedPlanSummary) {
+      setAppliedPlanSummary(null);
+    }
+  }, [fixtureOverrides]);
+
+  return (
+    <PlayerContext.Provider value={{ 
+      globalPlayers, setGlobalPlayers, isLoadingDB, updatePlayerStat, teamId, setTeamId, teamData, setTeamData,
+      availableGWs, setAvailableGWs, horizon, setHorizon, activeGW, setActiveGW, captainId, setCaptainId,
+      viceId, setViceId, itb, setItb, availableFts, setAvailableFts, initialSquadIds, setInitialSquadIds,
+      solverResult, setSolverResult, activeChip, setActiveChip, manualOverrides, setManualOverrides, isLoggedIn,
+      setIsLoggedIn, userProfile, setUserProfile, hasGuestMadeEdits, setHasGuestMadeEdits, projSearchTerm, setProjSearchTerm,
+      sessionEdits, setSessionEdits, highlightTransferIds, setHighlightTransferIds, transfersByGw, setTransfersByGw,
+      chipsByGw, setChipsByGw, baselineItb, setBaselineItb, baselineFt, setBaselineFt, quickSettings, setQuickSettings,
+      advancedSettings, setAdvancedSettings, solveElapsedSec, setSolveElapsedSec, solverTransferPairs, setSolverTransferPairs,
+      solverApplySnapshot, setSolverApplySnapshot, appliedPlanSummary, setAppliedPlanSummary, hitsThisGw, setHitsThisGw,
+      numSims, setNumSims, HIT_COST, comprehensiveSettings, setComprehensiveSettings, saveSession, ftAtStartOfGw, itbAtStartOfGw, 
+      isCheckingAuth, drafts, setDrafts, activeDraftId, setActiveDraftId,fixtureOverrides, setFixtureOverrides,originalPlayers, 
+      setOriginalPlayers, globalFixtures, setGlobalFixtures, effectiveFixtures, globalXmins
+    }}>
+      {children}
+    </PlayerContext.Provider>
+  );
+};

frontend/src/components/AccuracyDashboard.jsx

@@ -0,0 +1,273 @@
+import React, { useState, useEffect } from 'react';
+import { LineChart, Line, XAxis, YAxis, CartesianGrid, Tooltip as RechartsTooltip, ResponsiveContainer, ScatterChart, Scatter } from 'recharts';
+
+export default function AccuracyDashboard() {
+  const [activeTab, setActiveTab] = useState('match outcome');
+  const [matchData, setMatchData] = useState([]);
+  const [playerData, setPlayerData] = useState([]);
+  const [isLoading, setIsLoading] = useState(true);
+
+  useEffect(() => {
+    Promise.all([
+      fetch('https://anayshukla-fpl-solver.hf.space/api/accuracy/matches').then(res => res.json()),
+      fetch('https://anayshukla-fpl-solver.hf.space/api/accuracy/players').then(res => res.json())
+    ]).then(([matches, players]) => {
+      setMatchData(matches);
+      setPlayerData(players);
+      setIsLoading(false);
+    });
+  }, []);
+
+  if (isLoading) return <div className="text-luigi-400 animate-pulse p-8">Loading Model Diagnostics...</div>;
+
+  // --- MATH HELPERS ---
+  const calcMetrics = (y_true, y_pred) => {
+    const n = y_true.length;
+    if (n === 0) return { rmse: 0, mae: 0, r2: 0 };
+    
+    let sumErrSq = 0, sumErrAbs = 0, sumY = 0;
+    for (let i = 0; i < n; i++) {
+      sumErrSq += Math.pow(y_true[i] - y_pred[i], 2);
+      sumErrAbs += Math.abs(y_true[i] - y_pred[i]);
+      sumY += y_true[i];
+    }
+    const meanY = sumY / n;
+    let ssTot = 0;
+    for (let i = 0; i < n; i++) ssTot += Math.pow(y_true[i] - meanY, 2);
+
+    return {
+      rmse: Math.sqrt(sumErrSq / n),
+      mae: sumErrAbs / n,
+      r2: ssTot === 0 ? 0 : 1 - (sumErrSq / ssTot)
+    };
+  };
+
+  // --- OUTCOME ACCURACY MATH ---
+  let globalLL = 0, globalBrier = 0;
+  const trendData = [];
+  
+  // --- GOALS & XG MATH ---
+  const actGoals = [], projGoals = [], actXG = [];
+  const scatterDataGoals = [], scatterDataXG = [];
+
+  if (matchData.length > 0) {
+    let totalMatches = 0;
+    const gwMap = matchData.reduce((acc, row) => {
+      (acc[row.GW] = acc[row.GW] || []).push(row);
+      return acc;
+    }, {});
+
+    Object.keys(gwMap).sort((a,b) => a-b).forEach(gw => {
+      const matches = gwMap[gw];
+      let gwLL = 0, gwBrier = 0;
+      
+      matches.forEach(m => {
+        // Log loss
+        const p_h = Math.max(Math.min(m.home_win_prob, 1-1e-15), 1e-15);
+        const p_d = Math.max(Math.min(m.draw_prob, 1-1e-15), 1e-15);
+        const p_a = Math.max(Math.min(m.away_win_prob, 1-1e-15), 1e-15);
+        
+        const ll = - ((m.home_win * Math.log(p_h)) + (m.draw * Math.log(p_d)) + (m.away_win * Math.log(p_a)));
+        gwLL += ll; globalLL += ll;
+
+        // Brier Score
+        const brier = Math.pow(p_h - m.home_win, 2) + Math.pow(p_d - m.draw, 2) + Math.pow(p_a - m.away_win, 2);
+        gwBrier += brier; globalBrier += brier;
+        totalMatches++;
+
+        // Goals & xG Collections
+        if (m.home_goals !== undefined && m.expected_home_goals !== undefined) {
+          actGoals.push(Number(m.home_goals));
+          projGoals.push(Number(m.expected_home_goals));
+          actXG.push(Number(m.xg_home));
+          scatterDataGoals.push({ proj: Number(m.expected_home_goals), act: Number(m.home_goals) });
+          scatterDataXG.push({ proj: Number(m.expected_home_goals), act: Number(m.xg_home) });
+
+          actGoals.push(Number(m.away_goals));
+          projGoals.push(Number(m.expected_away_goals));
+          actXG.push(Number(m.xg_away));
+          scatterDataGoals.push({ proj: Number(m.expected_away_goals), act: Number(m.away_goals) });
+          scatterDataXG.push({ proj: Number(m.expected_away_goals), act: Number(m.xg_away) });
+        }
+      });
+
+      trendData.push({ gw: `GW${gw}`, weeklyBrier: gwBrier / matches.length, cumBrier: globalBrier / totalMatches });
+    });
+    globalLL /= totalMatches;
+    globalBrier /= totalMatches;
+  }
+
+  const goalsMetrics = calcMetrics(actGoals, projGoals);
+  const xgMetrics = calcMetrics(actXG, projGoals);
+
+  // --- xMINS / xPTS MATH ---
+  let ptsMetrics = { rmse: 0, mae: 0, r2: 0 };
+  let minsMetrics = { rmse: 0, mae: 0, r2: 0 };
+
+  if (playerData.length > 0) {
+    const actPts = [], pPts = [], actMins = [], pMins = [];
+    playerData.forEach(p => {
+      for (let gw = 1; gw <= 38; gw++) {
+        if (p[`${gw}_xMins`] > 0 && p[`${gw}_Pts`] !== undefined && p[`${gw}_Actuals`] !== undefined) {
+          pPts.push(Number(p[`${gw}_Pts`]));
+          actPts.push(Number(p[`${gw}_Actuals`]));
+          pMins.push(Number(p[`${gw}_xMins`]));
+          actMins.push(Number(p[`${gw}_Mins`]) || 0);
+        }
+      }
+    });
+    ptsMetrics = calcMetrics(actPts, pPts);
+    minsMetrics = calcMetrics(actMins, pMins);
+  }
+
+  return (
+    <div className="space-y-6">
+      {/* TABS */}
+      <div className="flex gap-4 border-b border-slate-800 pb-2">
+        {['match outcome', 'goals & xg', 'player_projections'].map(tab => (
+          <button 
+            key={tab}
+            onClick={() => setActiveTab(tab)}
+            className={`px-4 py-2 text-sm font-bold uppercase tracking-wider transition-colors ${activeTab === tab ? 'text-luigi-400 border-b-2 border-luigi-400' : 'text-slate-500 hover:text-slate-300'}`}
+          >
+            {tab.replace('_', ' ')}
+          </button>
+        ))}
+      </div>
+
+      {/* TAB 1: OUTCOME */}
+      {activeTab === 'match outcome' && (
+        <div className="space-y-6 animate-in fade-in">
+          <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
+            <div className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm">
+              <div className="text-slate-400 text-sm font-bold mb-1">Multi-class Log Loss</div>
+              <div className="text-4xl font-mono text-slate-100">{globalLL.toFixed(4)}</div>
+            </div>
+            <div className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm">
+              <div className="text-slate-400 text-sm font-bold mb-1">Multi-class Brier Score</div>
+              <div className="text-4xl font-mono text-luigi-400">{globalBrier.toFixed(4)}</div>
+            </div>
+          </div>
+
+          <div className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm h-[500px]">
+            <h3 className="text-lg font-bold text-slate-200 mb-6">Brier Score Trend (Lower is Better)</h3>
+            <div className="w-full h-[90%] overflow-x-auto custom-scrollbar">
+              <div className="min-w-[600px] h-full">
+                <ResponsiveContainer width="100%" height="100%">
+                  <LineChart data={trendData}>
+                    <CartesianGrid strokeDasharray="3 3" stroke="#1e293b" />
+                    <XAxis dataKey="gw" stroke="#64748b" tick={{fontSize: 12}} />
+                    <YAxis stroke="#64748b" domain={['auto', 'auto']} reversed />
+                    <RechartsTooltip contentStyle={{ backgroundColor: '#0f172a', borderColor: '#334155' }} />
+                    <Line type="monotone" dataKey="weeklyBrier" stroke="#64748b" strokeDasharray="5 5" name="Weekly Brier" />
+                    <Line type="monotone" dataKey="cumBrier" stroke="#34d399" strokeWidth={3} name="Cumulative Brier" />
+                  </LineChart>
+                </ResponsiveContainer>
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
+
+      {/* TAB 2: GOALS & XG */}
+      {activeTab === 'goals & xg' && (
+        <div className="space-y-6 animate-in fade-in">
+          <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+            
+            {/* GOALS VS PROJ */}
+            <div className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm">
+              <h3 className="text-lg font-bold text-slate-200 mb-4 border-b border-slate-800 pb-2">Goals v/s Projected</h3>
+              <div className="flex gap-6 mb-6">
+                <div><span className="text-xs text-slate-500 block">RMSE</span><span className="text-xl font-mono text-slate-200">{goalsMetrics.rmse.toFixed(3)}</span></div>
+                <div><span className="text-xs text-slate-500 block">MAE</span><span className="text-xl font-mono text-slate-200">{goalsMetrics.mae.toFixed(3)}</span></div>
+              </div>
+              <div className="h-[300px] w-full overflow-x-auto custom-scrollbar">
+                <div className="min-w-[500px] h-full">
+                  <ResponsiveContainer width="100%" height="100%">
+                    <ScatterChart margin={{ top: 10, right: 20, bottom: 20, left: 10 }}>
+                      <CartesianGrid strokeDasharray="3 3" stroke="#1e293b" />
+                      <XAxis type="number" dataKey="proj" name="Projected" stroke="#64748b" label={{ value: 'Projected Goals', position: 'insideBottom', offset: -10, fill: '#64748b' }}/>
+                      <YAxis type="number" dataKey="act" name="Actual" stroke="#64748b" label={{ value: 'Actual Goals', angle: -90, position: 'insideLeft', fill: '#64748b' }}/>
+                      <RechartsTooltip cursor={{ strokeDasharray: '3 3' }} contentStyle={{backgroundColor: '#0f172a', borderColor: '#334155'}} />
+                      <Scatter name="Matches" data={scatterDataGoals} fill="#34d399" opacity={0.6} isAnimationActive={false} />
+                    </ScatterChart>
+                  </ResponsiveContainer>
+                </div>
+              </div>
+            </div>
+
+            {/* XG VS PROJ */}
+            <div className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm">
+              <h3 className="text-lg font-bold text-slate-200 mb-4 border-b border-slate-800 pb-2">xG v/s Projected</h3>
+              <div className="flex gap-6 mb-6">
+                <div><span className="text-xs text-slate-500 block">RMSE</span><span className="text-xl font-mono text-slate-200">{xgMetrics.rmse.toFixed(3)}</span></div>
+                <div><span className="text-xs text-slate-500 block">MAE</span><span className="text-xl font-mono text-slate-200">{xgMetrics.mae.toFixed(3)}</span></div>
+              </div>
+              <div className="h-[300px] w-full overflow-x-auto custom-scrollbar">
+                <div className="min-w-[500px] h-full">
+                  <ResponsiveContainer width="100%" height="100%">
+                    <ScatterChart margin={{ top: 10, right: 20, bottom: 20, left: 10 }}>
+                      <CartesianGrid strokeDasharray="3 3" stroke="#1e293b" />
+                      <XAxis type="number" dataKey="proj" name="Projected" stroke="#64748b" label={{ value: 'Projected Goals', position: 'insideBottom', offset: -10, fill: '#64748b' }}/>
+                      <YAxis type="number" dataKey="act" name="Actual xG" stroke="#64748b" label={{ value: 'xG Generated', angle: -90, position: 'insideLeft', fill: '#64748b' }}/>
+                      <RechartsTooltip cursor={{ strokeDasharray: '3 3' }} contentStyle={{backgroundColor: '#0f172a', borderColor: '#334155'}} />
+                      <Scatter name="Matches" data={scatterDataXG} fill="#f43f5e" opacity={0.6} isAnimationActive={false} />
+                    </ScatterChart>
+                  </ResponsiveContainer>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      )}
+
+      {/* TAB 3: PLAYER STATS */}
+      {activeTab === 'player_projections' && (
+        <div className="space-y-6 animate-in fade-in">
+          <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+            
+            <div className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm">
+              {/* Updated Title */}
+              <h3 className="text-lg font-bold text-slate-200 mb-4 border-b border-slate-800 pb-2">xMins Accuracy (0&lt; xMins)</h3>
+              <div className="grid grid-cols-3 gap-4">
+                <div className="bg-slate-950 p-4 rounded-lg border border-slate-800/50">
+                  <div className="text-xs text-slate-500 mb-1">R2 Score</div>
+                  <div className="text-xl font-mono text-cyan-400">{minsMetrics.r2.toFixed(3)}</div>
+                </div>
+                <div className="bg-slate-950 p-4 rounded-lg border border-slate-800/50">
+                  <div className="text-xs text-slate-500 mb-1">MAE</div>
+                  <div className="text-xl font-mono text-slate-200">{minsMetrics.mae.toFixed(3)}</div>
+                </div>
+                <div className="bg-slate-950 p-4 rounded-lg border border-slate-800/50">
+                  <div className="text-xs text-slate-500 mb-1">RMSE</div>
+                  <div className="text-xl font-mono text-slate-200">{minsMetrics.rmse.toFixed(3)}</div>
+                </div>
+              </div>
+            </div>
+
+            <div className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm">
+              {/* Updated Title */}
+              <h3 className="text-lg font-bold text-slate-200 mb-4 border-b border-slate-800 pb-2">xPts Accuracy (0&lt; xPts)</h3>
+              <div className="grid grid-cols-3 gap-4">
+                <div className="bg-slate-950 p-4 rounded-lg border border-slate-800/50">
+                  <div className="text-xs text-slate-500 mb-1">R2 Score</div>
+                  <div className="text-xl font-mono text-luigi-400">{ptsMetrics.r2.toFixed(3)}</div>
+                </div>
+                <div className="bg-slate-950 p-4 rounded-lg border border-slate-800/50">
+                  <div className="text-xs text-slate-500 mb-1">MAE</div>
+                  <div className="text-xl font-mono text-slate-200">{ptsMetrics.mae.toFixed(3)}</div>
+                </div>
+                <div className="bg-slate-950 p-4 rounded-lg border border-slate-800/50">
+                  <div className="text-xs text-slate-500 mb-1">RMSE</div>
+                  <div className="text-xl font-mono text-slate-200">{ptsMetrics.rmse.toFixed(3)}</div>
+                </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/ActiveMovesPanel.jsx

@@ -0,0 +1,94 @@
+import React from "react";
+import { ArrowRightLeft } from "lucide-react";
+import { CHIP_CONFIG, getPlayerPrice } from "../utils/fplLogic";
+
+export const ActiveMovesPanel = ({
+  activeGW,
+  manualOverrides,
+  globalPlayers,
+  chipsByGw,
+  transfersByGw
+}) => {
+  const activeLock = manualOverrides[activeGW] || {};
+  const manualTransfers = activeLock.manualTransfers || {};
+  const chip = chipsByGw[activeGW];
+  const tData = transfersByGw[activeGW] || { count: 0, netDelta: 0 };
+
+  const moveEntries = Object.entries(manualTransfers);
+  const hasMoves = moveEntries.length > 0;
+
+  return (
+    <div className="w-full bg-slate-950 border border-slate-800 rounded-2xl flex flex-col shadow-2xl overflow-hidden shrink-0 transition-all duration-300">
+      
+      {/* Header */}
+      <div className="border-b border-slate-800 px-4 py-3 bg-slate-900/80 flex justify-between items-center">
+        <h2 className="text-xs font-black uppercase tracking-widest text-slate-300 flex items-center gap-2">
+          <ArrowRightLeft size={14} className="text-cyan-400" />
+          GW {activeGW} Moves Made So Far
+        </h2>
+        {chip && CHIP_CONFIG[chip] && (
+          <span className={`text-[9px] font-black px-1.5 py-0.5 rounded ${CHIP_CONFIG[chip].badge}`}>
+            {CHIP_CONFIG[chip].short}
+          </span>
+        )}
+      </div>
+
+      {/* Body */}
+      <div className="p-4 flex flex-col gap-2">
+        {!hasMoves ? (
+          <div className="text-center text-slate-500 text-[10px] italic py-2">
+            No active transfers made for GW {activeGW}.
+          </div>
+        ) : (
+          moveEntries.map(([inIdStr, outPlayer], idx) => {
+            const isBlankIn = inIdStr.startsWith("blank_");
+            const inPlayer = !isBlankIn ? globalPlayers.find(p => String(p.ID) === inIdStr) : null;
+
+            return (
+              <div key={idx} className="flex items-center justify-between bg-slate-900/50 border border-slate-800/80 rounded-lg p-2.5 font-mono text-xs shadow-inner">
+                
+                {/* Outgoing Player */}
+                <div className="flex-1 min-w-0 flex flex-col">
+                  <span className="text-red-400 truncate font-bold">{outPlayer?.Name || "Unknown"}</span>
+                  <span className="text-slate-500 text-[9px]">£{(outPlayer ? getPlayerPrice(outPlayer) : 0).toFixed(1)}m</span>
+                </div>
+
+                <span className="text-slate-600 font-black px-3">»</span>
+
+                {/* Incoming Player */}
+                <div className="flex-1 min-w-0 flex flex-col items-end text-right">
+                  {isBlankIn ? (
+                    <>
+                      <span className="text-yellow-500/70 italic truncate text-[11px] mt-0.5">Select Player...</span>
+                    </>
+                  ) : (
+                    <>
+                      <span className="text-emerald-400 truncate font-bold">{inPlayer?.Name || inIdStr}</span>
+                      <span className="text-slate-500 text-[9px]">£{(inPlayer ? getPlayerPrice(inPlayer) : 0).toFixed(1)}m</span>
+                    </>
+                  )}
+                </div>
+
+              </div>
+            );
+          })
+        )}
+
+        {/* Summary Footer */}
+        {hasMoves && (
+          <div className="mt-2 pt-3 border-t border-slate-800/80 flex justify-between items-center text-[10px] font-bold">
+            <span className="text-slate-400 uppercase tracking-wider">
+              Total Moves: <span className="text-cyan-400 font-mono text-xs ml-1">{tData.count}</span>
+            </span>
+            <span className="text-slate-400 uppercase tracking-wider">
+              Bank Delta: 
+              <span className={`font-mono text-xs ml-1 ${tData.netDelta >= 0 ? 'text-emerald-400' : 'text-red-400'}`}>
+                {tData.netDelta > 0 ? '+' : ''}{tData.netDelta.toFixed(1)}m
+              </span>
+            </span>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};

frontend/src/components/AdvancedSettingsModal.jsx

@@ -0,0 +1,254 @@
+import React, { useState } from "react";
+import { X, Power, Info, RotateCcw } from "lucide-react";
+
+// The absolute baseline FPL defaults as defined in your comprehensive_settings.json
+export const DEFAULT_SETTINGS = {
+  enabled: false,
+  secs: 600,
+  hit_limit: 0,
+  no_transfer_last_gws: 0,
+  keep_top_ev_percent: 7,
+  ft_use_penalty: 0.1,
+  itb_loss_per_transfer: 0.0,
+  vcap_weight: 0.1,
+  opposing_play_penalty: 0.5,
+  use_ft_value_list: false, // Sub-toggle for FT behavior
+  ft_value: 1.5,
+  xmin_lb: 45,
+  ft_value_list: { "2": 2, "3": 1.6, "4": 1.3, "5": 1.1 },
+  bench_weights: { "0": 0.03, "1": 0.21, "2": 0.06, "3": 0.002 },
+  randomization_strength: 1.0,
+  iteration_criteria: "this_gw_transfer_in_out",
+  iteration_diff: 2,
+};
+
+export function AdvancedSettingsModal({
+  setShowAdvancedSettings,
+  comprehensiveSettings,
+  setComprehensiveSettings,
+}) {
+  const [isEnabled, setIsEnabled] = useState(
+    comprehensiveSettings.enabled ?? false
+  );
+
+  const handleToggle = () => {
+    const newState = !isEnabled;
+    setIsEnabled(newState);
+    setComprehensiveSettings((prev) => ({ ...prev, enabled: newState }));
+  };
+
+  const handleResetToDefaults = () => {
+    if (window.confirm("Are you sure you want to restore all advanced settings to their recommended defaults?")) {
+      // Restore all defaults, but preserve whatever the current toggle state is!
+      setComprehensiveSettings({ ...DEFAULT_SETTINGS, enabled: isEnabled });
+    }
+  };
+
+  const handleChange = (key, value, nestedKey = null) => {
+    setComprehensiveSettings((prev) => {
+      if (nestedKey !== null) {
+        return {
+          ...prev,
+          [key]: {
+            ...(prev[key] || {}),
+            [nestedKey]: value,
+          },
+        };
+      }
+      return { ...prev, [key]: value };
+    });
+  };
+
+  // Check if we are using the dynamic list or the flat value
+  const isUsingFtList = comprehensiveSettings.use_ft_value_list ?? DEFAULT_SETTINGS.use_ft_value_list;
+
+  const SETTINGS_GROUPS = [
+    {
+      title: "Solver Constraints",
+      items: [
+        { key: "secs", label: "Solve Time Limit (secs)", type: "number", step: "1", default: DEFAULT_SETTINGS.secs, desc: "Maximum time in seconds allowed for the solver per iteration." },
+        { key: "hit_limit", label: "Max Horizon Hits", type: "number", step: "1", default: DEFAULT_SETTINGS.hit_limit, desc: "Maximum total hits allowed over the entire horizon. Leave blank for infinite." },
+        { key: "no_transfer_last_gws", label: "No Transfers Last X GWs", type: "number", step: "1", default: DEFAULT_SETTINGS.no_transfer_last_gws, desc: "Prevent transfers in the final X gameweeks of the horizon." },
+        { key: "xmin_lb", label: "Min xMins (Per GW)", type: "number", step: "1", default: DEFAULT_SETTINGS.xmin_lb, desc: "Minimum expected minutes per GW. Multiplied by the horizon length to filter out non-playing players before solving." },
+        { key: "keep_top_ev_percent", label: "Keep Top EV (%)", type: "number", step: "1", default: DEFAULT_SETTINGS.keep_top_ev_percent, desc: "Percentage of top EV players to keep for the solve." },
+      ]
+    },
+    {
+      title: "Penalties & Weights",
+      items: [
+        { key: "ft_use_penalty", label: "FT Use Penalty", type: "number", step: "0.01", default: DEFAULT_SETTINGS.ft_use_penalty, desc: "Penalty applied for using a free transfer (encourages rolling)." },
+        { key: "itb_loss_per_transfer", label: "ITB Loss per Transfer", type: "number", step: "0.01", default: DEFAULT_SETTINGS.itb_loss_per_transfer, desc: "Artificial cost deducted from ITB per transfer to prefer cheaper identical-EV moves." },
+        { key: "vcap_weight", label: "Vice-Captain Weight", type: "number", step: "0.01", default: DEFAULT_SETTINGS.vcap_weight, desc: "Fractional EV added to the Vice Captain in case the main captain does not play." },
+        { key: "opposing_play_penalty", label: "Opposing Play Penalty", type: "number", step: "0.01", default: DEFAULT_SETTINGS.opposing_play_penalty, desc: "Penalty applied when attacking players face defensive players in your lineup." },
+      ]
+    },
+    {
+      title: "Bench Weights",
+      desc: "Fractional EV added to bench players based on their bench order.",
+      isNested: true,
+      parentKey: "bench_weights",
+      items: [
+        { nestedKey: "0", label: "Goalkeeper", type: "number", step: "0.01", default: DEFAULT_SETTINGS.bench_weights["0"] },
+        { nestedKey: "1", label: "Outfield 1st", type: "number", step: "0.01", default: DEFAULT_SETTINGS.bench_weights["1"] },
+        { nestedKey: "2", label: "Outfield 2nd", type: "number", step: "0.01", default: DEFAULT_SETTINGS.bench_weights["2"] },
+        { nestedKey: "3", label: "Outfield 3rd", type: "number", step: "0.01", default: DEFAULT_SETTINGS.bench_weights["3"] },
+      ]
+    },
+    {
+      title: "Iterations & Simulations",
+      items: [
+        { key: "randomization_strength", label: "Randomization Strength", type: "number", step: "0.01", default: DEFAULT_SETTINGS.randomization_strength, desc: "Multiplier/Strength for adding noise to EVs during Sensitivity Analysis." },
+        { key: "iteration_criteria", label: "Iteration Criteria", type: "select", default: DEFAULT_SETTINGS.iteration_criteria, desc: "Rule to generate alternative solutions in subsequent iterations.",
+          options: [
+            { value: "this_gw_transfer_in_out", label: "Transfers In & Out (Current GW)" },
+            { value: "this_gw_transfer_in", label: "Transfers In (Current GW)" },
+            { value: "this_gw_transfer_out", label: "Transfers Out (Current GW)" },
+          ]
+        },
+        { key: "iteration_diff", label: "Iteration Difference", type: "number", step: "1", default: DEFAULT_SETTINGS.iteration_diff, desc: "Minimum number of transfers that must change to find an alternate optimal solution." }
+      ]
+    }
+  ];
+
+  return (
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/80 backdrop-blur-sm p-4">
+      <div className="bg-slate-950 border border-slate-800 w-full max-w-3xl max-h-[90vh] overflow-y-auto rounded-2xl flex flex-col shadow-2xl">
+        
+        {/* Header */}
+        <div className="sticky top-0 z-30 bg-slate-950/90 backdrop-blur-md border-b border-slate-800 px-6 py-4 flex items-center justify-between">
+          <div>
+            <h3 className="text-xl font-black text-slate-100 flex items-center gap-2">
+              Advanced Algorithm Settings
+            </h3>
+            <p className="text-xs text-slate-400 mt-1">Configure comprehensive internal MILP parameters and weights.</p>
+          </div>
+          <div className="flex items-center gap-3">
+            <button onClick={handleResetToDefaults} className="flex items-center gap-1.5 text-xs font-bold text-slate-400 hover:text-red-400 transition-colors bg-slate-900 px-3 py-2 rounded-lg border border-slate-800 hover:border-red-500/30">
+              <RotateCcw size={14} /> Defaults
+            </button>
+            <button onClick={() => setShowAdvancedSettings(false)} className="text-slate-500 hover:text-white transition-colors bg-slate-900 p-2 rounded-lg border border-slate-800">
+              <X size={20} />
+            </button>
+          </div>
+        </div>
+
+        {/* Body */}
+        <div className="p-6 flex flex-col gap-8">
+          
+          {/* Master Toggle */}
+          <div className={`p-4 rounded-xl border flex items-center justify-between transition-colors shadow-lg ${isEnabled ? 'bg-luigi-500/10 border-luigi-500/30' : 'bg-slate-900 border-slate-700'}`}>
+            <div className="flex items-center gap-4">
+              <div className={`p-2.5 rounded-lg ${isEnabled ? 'bg-luigi-500/20 text-luigi-400' : 'bg-slate-800 text-slate-500'}`}>
+                <Power size={22} />
+              </div>
+              <div>
+                <h4 className={`font-bold text-lg ${isEnabled ? 'text-luigi-400' : 'text-slate-400'}`}>Enable Advanced Overrides</h4>
+                <p className="text-xs text-slate-500">When enabled, these parameters will be injected into the solver payload.</p>
+              </div>
+            </div>
+            <button 
+              onClick={handleToggle}
+              className={`relative inline-flex h-7 w-12 items-center rounded-full transition-colors focus:outline-none ${isEnabled ? 'bg-luigi-500' : 'bg-slate-700'}`}
+            >
+              <span className={`inline-block h-5 w-5 transform rounded-full bg-white transition-transform ${isEnabled ? 'translate-x-6' : 'translate-x-1'}`} />
+            </button>
+          </div>
+
+          <div className={`flex flex-col gap-8 transition-opacity duration-300 ${!isEnabled ? 'opacity-30 pointer-events-none grayscale' : 'opacity-100'}`}>
+            
+            {/* SPECIAL SECTION: Free Transfer Valuation */}
+            <div className="bg-slate-900/40 rounded-2xl p-5 border border-slate-800/60">
+                <div className="mb-5 border-b border-slate-800 pb-3 flex items-center justify-between">
+                  <div>
+                    <h4 className="text-sm font-black text-slate-400 uppercase tracking-widest">FT Val</h4>
+                    <p className="text-[11px] text-slate-500 mt-1">Intrinsic EV value assigned for holding/rolling free transfers.</p>
+                  </div>
+                  <div className="flex items-center gap-2">
+                     <span className="text-xs font-bold text-slate-400">Dynamic List</span>
+                     <button onClick={() => handleChange("use_ft_value_list", !isUsingFtList)} className={`relative inline-flex h-5 w-9 items-center rounded-full transition-colors focus:outline-none ${isUsingFtList ? 'bg-luigi-500' : 'bg-slate-700'}`}>
+                        <span className={`inline-block h-3 w-3 transform rounded-full bg-white transition-transform ${isUsingFtList ? 'translate-x-5' : 'translate-x-1'}`} />
+                     </button>
+                  </div>
+                </div>
+
+                {isUsingFtList ? (
+                    <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                        {["2", "3", "4", "5"].map((num) => (
+                           <div key={`ft_${num}`} className="bg-slate-900 border border-slate-700 p-4 rounded-xl">
+                             <label className="text-xs font-bold text-slate-300 block mb-2">Value of {num}{num==='2'?'nd':num==='3'?'rd':'th'} FT</label>
+                             <input type="number" step="0.1" value={comprehensiveSettings.ft_value_list?.[num] ?? DEFAULT_SETTINGS.ft_value_list[num]} onChange={(e) => handleChange("ft_value_list", parseFloat(e.target.value) || 0, num)} className="w-full bg-slate-950 border border-slate-700 rounded-lg px-3 py-2 text-sm text-slate-100 focus:outline-none focus:border-luigi-500 font-mono" />
+                           </div>
+                        ))}
+                    </div>
+                ) : (
+                    <div className="bg-slate-900/50 border border-slate-700 p-4 rounded-xl flex items-center justify-center text-center h-[88px]">
+                        <p className="text-xs text-slate-400 font-bold">Using standard flat FT Value from normal settings.</p>
+                    </div>
+                )}
+            </div>
+
+            {/* Render Remaining Standard Settings Groups */}
+            {SETTINGS_GROUPS.map((group, idx) => (
+              <div key={idx} className="bg-slate-900/40 rounded-2xl p-5 border border-slate-800/60">
+                <div className="mb-5 border-b border-slate-800 pb-3">
+                  <h4 className="text-sm font-black text-slate-400 uppercase tracking-widest">{group.title}</h4>
+                  {group.desc && <p className="text-[11px] text-slate-500 mt-1">{group.desc}</p>}
+                </div>
+                
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                  {group.items.map((item) => {
+                    let val = group.isNested 
+                      ? (comprehensiveSettings[group.parentKey]?.[item.nestedKey] ?? item.default)
+                      : (comprehensiveSettings[item.key] ?? item.default);
+
+                    return (
+                      <div key={item.key || item.nestedKey} className="bg-slate-900 border border-slate-700 p-4 rounded-xl relative group hover:border-slate-500 transition-colors">
+                        <div className="flex justify-between items-center mb-2">
+                          <label className="text-xs font-bold text-slate-300">{item.label}</label>
+                          <Info size={14} className="text-slate-600 group-hover:text-luigi-400 transition-colors" />
+                        </div>
+                        
+                        {item.type === "select" ? (
+                          <select value={val} onChange={(e) => handleChange(item.key, e.target.value)} className="w-full bg-slate-950 border border-slate-700 rounded-lg px-3 py-2 text-sm text-slate-100 focus:outline-none focus:border-luigi-500 cursor-pointer">
+                            {item.options.map(opt => <option key={opt.value} value={opt.value}>{opt.label}</option>)}
+                          </select>
+                        ) : (
+                          <input 
+                            type={item.type} 
+                            step={item.step} 
+                            min={item.min} 
+                            // THE FIX 1: If it's a checkbox, use 'checked'. Otherwise use 'value'.
+                            checked={item.type === "checkbox" ? Boolean(val) : undefined}
+                            value={item.type !== "checkbox" ? (val === "" ? "" : val) : undefined} 
+                            placeholder={item.default === "" ? "None" : item.default} 
+                            onChange={(e) => { 
+                              // THE FIX 2: Safely extract boolean for checkboxes, numbers for everything else
+                              let newVal;
+                              if (item.type === "checkbox") {
+                                newVal = e.target.checked;
+                              } else {
+                                newVal = e.target.value === "" ? "" : (parseFloat(e.target.value) || 0);
+                              }
+                              
+                              group.isNested ? handleChange(group.parentKey, newVal, item.nestedKey) : handleChange(item.key, newVal); 
+                            }} 
+                            className={`bg-slate-950 border border-slate-700 rounded-lg text-sm text-slate-100 focus:outline-none focus:border-luigi-500 font-mono ${item.type === 'checkbox' ? 'w-5 h-5 accent-luigi-500 cursor-pointer' : 'w-full px-3 py-2'}`} 
+                          />
+                        )}
+
+                        <div className="absolute left-0 -bottom-2 translate-y-full opacity-0 group-hover:opacity-100 transition-opacity z-20 w-[110%] bg-slate-800 text-slate-300 text-[11px] p-2.5 rounded-lg shadow-xl pointer-events-none border border-slate-700">
+                          {item.desc || group.desc}
+                        </div>
+                      </div>
+                    );
+                  })}
+                </div>
+              </div>
+            ))}
+          </div>
+
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/DraftsComparisonTable.jsx

@@ -0,0 +1,140 @@
+import React from "react";
+import { Trash2 } from "lucide-react";
+
+export const DraftsComparisonTable = ({ 
+  drafts, horizonGWs, activeDraftId, globalPlayers, 
+  setActiveDraftId, getValidLayout, availableGWs, 
+  baselineFt, ftAtStartOfGw, setDrafts
+}) => {
+  if (!drafts || drafts.length === 0) return null; 
+
+  const handleDeleteDraft = (e, id) => {
+    e.stopPropagation(); // Prevents the row click from triggering
+    if (drafts.length <= 1) return;
+    const nextDrafts = drafts.filter(d => d.id !== id);
+    setDrafts(nextDrafts);
+    if (activeDraftId === id) setActiveDraftId(nextDrafts[0].id);
+  };
+
+  const getDraftGwState = (draft, gw) => {
+    if (draft.cachedEvs && draft.cachedEvs[gw]) {
+        return draft.cachedEvs[gw];
+    }
+    const chip = draft.chipsByGw?.[gw];
+    const capMult = chip === "tc" ? 3 : 2;
+    let squad = [];
+    let capId = null;
+
+    if (gw === draft.activeGW) {
+        squad = draft.teamData;
+        capId = draft.captainId;
+    } else {
+        const lock = draft.manualOverrides?.[gw];
+        if (lock && lock.ids && lock.ids.length === 15) {
+            squad = lock.ids.map(id => draft.teamData?.find(p => String(p.ID) === String(id)) || globalPlayers.find(p => String(p.ID) === String(id))).filter(Boolean);
+            capId = lock.cap;
+            if (squad.length !== 15) {
+                const opt = getValidLayout(draft.teamData, gw);
+                if (opt) { squad = opt.optimalArray; capId = opt.cap; }
+            }
+        } else {
+            const opt = getValidLayout(draft.teamData, gw);
+            if (opt) { squad = opt.optimalArray; capId = opt.cap; }
+        }
+    }
+
+    let gwPts = 0;
+    if (squad && squad.length === 15) {
+        squad.slice(0, 11).forEach(p => {
+            if (!p.isBlank) gwPts += (Number(p[`${gw}_Pts`]) || 0) * (String(p.ID) === String(capId) ? capMult : 1);
+        });
+        let ofIdx = 0;
+        squad.slice(11, 15).forEach(p => {
+            if (!p.isBlank) {
+                if (chip === "bb") gwPts += (Number(p[`${gw}_Pts`]) || 0);
+                else if (p.Pos === "G") gwPts += (Number(p[`${gw}_Pts`]) || 0) * 0.04;
+                else { gwPts += (Number(p[`${gw}_Pts`]) || 0) * ([0.17, 0.05, 0.02][ofIdx] || 0.02); ofIdx++; }
+            }
+        });
+    }
+
+    const ftStart = ftAtStartOfGw(gw, availableGWs, baselineFt, draft.transfersByGw || {}, draft.chipsByGw || {});
+    const moves = draft.transfersByGw?.[gw]?.count || 0;
+    const isChipFree = chip === "wc" || chip === "fh";
+    const hits = isChipFree ? 0 : Math.max(0, moves - ftStart);
+
+    return { ev: gwPts - (hits * 4), chip, hits, ftStart, moves, isChipFree };
+  };
+
+  return (
+    <div className="w-full bg-[#0a0f1c] border border-[#2a2d5c] rounded-xl shadow-[0_0_30px_rgba(42,45,92,0.4)] overflow-hidden mb-6">
+      <div className="overflow-x-auto custom-scrollbar">
+        <table className="w-full text-center font-mono whitespace-nowrap">
+          <thead>
+            <tr className="text-slate-400 text-[9px] uppercase tracking-widest border-b border-[#2a2d5c] bg-[#050811]">
+              <th className="py-2 px-4 text-left font-black w-40">Timeline</th>
+              {horizonGWs.map(gw => (
+                <th key={gw} className="py-2 px-3 border-l border-[#1a1c3a]">GW{gw}</th>
+              ))}
+              <th className="py-2 px-4 text-emerald-400 font-black border-l border-[#2a2d5c] w-24 shadow-[inset_10px_0_20px_rgba(0,0,0,0.2)]">Total EV</th>
+            </tr>
+          </thead>
+          <tbody className="divide-y divide-[#1a1c3a]">
+            {drafts.map((draft) => {
+              const isActive = draft.id === activeDraftId;
+              const rowData = horizonGWs.map(gw => getDraftGwState(draft, gw));
+              const totalEv = rowData.reduce((sum, d) => sum + d.ev, 0);
+
+              return (
+                <tr 
+                  key={draft.id} 
+                  onClick={() => setActiveDraftId(draft.id)}
+                  className={`transition-all cursor-pointer group ${isActive ? "bg-[#1e2247]/60" : "bg-[#0a0f1c] hover:bg-[#151833]"}`}
+                >
+                  <td className="py-2.5 px-4 border-r border-[#1a1c3a]">
+                    <div className="flex items-center justify-between w-32">
+                      <div className={`font-bold text-[11px] truncate transition-colors ${isActive ? "text-white" : "text-slate-400 group-hover:text-slate-200"}`}>
+                        {draft.name}
+                      </div>
+                      {/* FIX: Native Flexbox Delete Button (always clickable, visually clean) */}
+                      {drafts.length > 1 && (
+                        <button 
+                          onClick={(e) => handleDeleteDraft(e, draft.id)} 
+                          className="p-1.5 text-slate-500 hover:text-red-400 hover:bg-red-500/10 rounded-md transition-all flex-shrink-0" 
+                          title="Delete Timeline"
+                        >
+                          <Trash2 size={12} />
+                        </button>
+                      )}
+                    </div>
+                  </td>
+
+                  {rowData.map((d, i) => (
+                    <td key={i} className="py-2 px-3 border-l border-[#1a1c3a] relative">
+                      <div className={`text-[15px] font-black tracking-tight drop-shadow-md ${isActive ? (d.ev > 55 ? 'text-[#818cf8]' : 'text-indigo-200') : 'text-slate-500'}`}>
+                        {d.ev.toFixed(1)}
+                      </div>
+                      <div className="flex justify-center items-center gap-1.5 mt-1">
+                        <span className="text-[8px] font-black uppercase text-[#c084fc] w-3 text-left">{d.chip || ""}</span>
+                        <span className={`text-[8.5px] font-bold flex items-center gap-1.5 ${isActive ? 'text-indigo-300' : 'text-slate-600'}`}>
+                          <span>{d.hits > 0 ? `-${d.hits*4}` : "-"}</span>
+                          <span>{d.isChipFree ? `${d.moves}/∞` : `${d.moves}/${d.ftStart}`}</span>
+                        </span>
+                      </div>
+                    </td>
+                  ))}
+
+                  <td className={`py-2 px-4 border-l border-[#2a2d5c] shadow-[inset_10px_0_20px_rgba(0,0,0,0.2)] ${isActive ? 'bg-[#050811]/40' : 'bg-[#050811]/80'}`}>
+                    <div className={`text-lg font-black drop-shadow-[0_0_10px_rgba(52,211,153,0.3)] ${isActive ? 'text-emerald-400' : 'text-emerald-700'}`}>
+                      {totalEv.toFixed(1)}
+                    </div>
+                  </td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  );
+};

frontend/src/components/DraggablePlayer.jsx

@@ -0,0 +1,72 @@
+import React from "react";
+import { useDraggable, useDroppable } from "@dnd-kit/core";
+import { CSS } from "@dnd-kit/utilities";
+import { PlayerCardVisual } from "./PlayerCardVisual"; // Import the visual component we just made
+
+export const DraggablePlayer = ({
+  player,
+  isBench,
+  benchIndex,
+  isActiveDrag,
+  isValidTarget,
+  captainId,
+  viceId,
+  handleCapChange,
+  playerCardGWs,
+  fixtures,
+  activeGW,
+  onPlayerClick,
+  onUndo,
+  isHighlighted,
+  onSolverUndo,
+  activeChipType,
+}) => {
+  const disableBenchGkDrag = Boolean(
+    isBench && benchIndex === 0 && player.Pos === "G" && !player.isBlank,
+  );
+  const { attributes, listeners, setNodeRef, transform, isDragging } =
+    useDraggable({
+      id: player.ID,
+      data: { player, isBench },
+      disabled: Boolean(player.isBlank),
+    });
+  const { setNodeRef: setDropRef, isOver } = useDroppable({
+    id: player.ID,
+    data: { player, isBench },
+  });
+
+  const style = {
+    transform: CSS.Translate.toString(transform),
+    zIndex: isDragging ? 50 : 20,
+    opacity: isDragging ? 0.6 : isActiveDrag && !isValidTarget ? 0.3 : 1,
+    filter: isOver && isValidTarget && !isDragging ? "brightness(1.5)" : "none",
+  };
+
+  return (
+    <div
+      ref={(node) => {
+        setNodeRef(node);
+        setDropRef(node);
+      }}
+      style={style}
+      {...listeners}
+      {...attributes}
+      className={`touch-none select-none rounded-xl transition-[box-shadow,filter] duration-200 ${isHighlighted ? "transfer-highlight-card ring-2 ring-cyan-400/40" : ""}`}
+    >
+      <PlayerCardVisual
+        player={player}
+        isBench={isBench}
+        captainId={captainId}
+        viceId={viceId}
+        handleCapChange={handleCapChange}
+        playerCardGWs={playerCardGWs}
+        fixtures={fixtures}
+        activeGW={activeGW}
+        onPlayerClick={() => onPlayerClick(player)}
+        onUndo={onUndo}
+        onSolverUndo={onSolverUndo}
+        activeChipType={activeChipType}
+      />
+    </div>
+  );
+};

frontend/src/components/FixtureMatrixPanel.jsx

@@ -0,0 +1,375 @@
+import React, { useMemo, useState, useRef, useContext } from "react";
+import { Plus, Trash2, Zap, Search, X, Database } from "lucide-react";
+import { PlayerContext } from '../PlayerContext';
+
+export const FixtureMatrixPanel = ({ 
+  globalPlayers, 
+  fixtureOverrides, 
+  setFixtureOverrides, 
+  availableGWs 
+}) => {
+  const { globalFixtures = {}, effectiveFixtures = {} } = useContext(PlayerContext);
+  const [search, setSearch] = useState("");
+  
+  // --- ADMIN BACKDOOR STATE ---
+  const [isAdmin, setIsAdmin] = useState(false);
+  const [adminPassword, setAdminPassword] = useState('');
+  const [showAdminLogin, setShowAdminLogin] = useState(false);
+  const [clickCount, setClickCount] = useState(0);
+  const clickTimeoutRef = useRef(null);
+
+  const handleSecretClick = () => {
+    setClickCount((prev) => {
+      const newCount = prev + 1;
+      if (newCount === 5) { setShowAdminLogin(!showAdminLogin); return 0; }
+      return newCount;
+    });
+    if (clickTimeoutRef.current) clearTimeout(clickTimeoutRef.current);
+    clickTimeoutRef.current = setTimeout(() => setClickCount(0), 1000);
+  };
+
+  const handlePublishGlobal = async () => {
+    if (!window.confirm("WARNING: This will overwrite the live FPL database for ALL users. Proceed?")) return;
+    
+    try {
+      const res = await fetch('https://anayshukla-fpl-solver.hf.space/api/fixtures/update', {
+        method: 'POST', headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ 
+          is_admin: isAdmin, admin_password: adminPassword,
+          overrides: { ...globalFixtures, ...fixtureOverrides } // Merges admin edits with existing globals
+        })
+      });
+      if (!res.ok) { if (res.status === 401) { alert("Invalid Admin Password!"); setIsAdmin(false); } throw new Error('Backend publish failed'); }
+      alert("Success! Global fixtures updated. All users will see these on refresh.");
+    } catch (err) { console.error("Publish error:", err); }
+  };
+
+  // 1. Extract all matches
+  const allMatches = useMemo(() => {
+    const TEAM_SHORTS = {
+      1: "ARS", 2: "AVL", 3: "BUR", 4: "BOU", 5: "BRE",
+      6: "BHA", 7: "CHE", 8: "CRY", 9: "EVE", 10: "FUL",
+      11: "LEE", 12: "LIV", 13: "MCI", 14: "MUN", 15: "NEW",
+      16: "NFO", 17: "SUN", 18: "TOT", 19: "WHU", 20: "WOL"
+    };
+
+    const matchMap = new Map();
+    globalPlayers.forEach(p => {
+      if (p.match_projections) {
+        Object.entries(p.match_projections).forEach(([matchId, data]) => {
+          if (!matchMap.has(matchId)) {
+            const [homeId, awayId] = matchId.split("_vs_");
+            const hName = TEAM_SHORTS[homeId] || homeId;
+            const aName = TEAM_SHORTS[awayId] || awayId;
+            
+            matchMap.set(matchId, {
+              id: matchId,
+              homeTeam: hName,
+              awayTeam: aName,
+              defaultGw: data.default_gw,
+              searchString: `${hName} ${aName}`.toLowerCase()
+            });
+          }
+        });
+      }
+    });
+    return Array.from(matchMap.values()).sort((a, b) => a.defaultGw - b.defaultGw);
+  }, [globalPlayers]);
+
+  const activeSplits = allMatches.filter(m => effectiveFixtures[m.id]);
+  const searchResults = search 
+    ? allMatches.filter(m => !effectiveFixtures[m.id] && m.searchString.includes(search.toLowerCase())).slice(0, 10)
+    : [];
+
+  // --- HANDLERS ---
+  const handleAddOverride = (match) => {
+    // THE FIX 4b: If they search a hidden global fixture, load its true splits! Otherwise default to 100%.
+    const initialSplit = globalFixtures[match.id] ? { ...globalFixtures[match.id] } : { [match.defaultGw]: 1.0 };
+    setFixtureOverrides(prev => ({ ...prev, [match.id]: initialSplit }));
+    setSearch(""); 
+  };
+
+  // 1. Create a "Blank" Split Row
+  const handleAddSplitGw = (matchId) => {
+    setFixtureOverrides(prev => {
+      const next = { ...prev };
+      const tempId = `unselected_${Date.now()}`;
+      next[matchId] = { ...next[matchId], [tempId]: 0.0 };
+      return next;
+    });
+  };
+
+  // Convert the "Blank" row into a real GW when user selects from dropdown
+  const handleChangeSplitGw = (matchId, oldGw, newGw) => {
+    setFixtureOverrides(prev => {
+      const next = { ...prev };
+      const matchOverrides = { ...next[matchId] };
+      const prob = matchOverrides[oldGw];
+      delete matchOverrides[oldGw];
+      matchOverrides[newGw] = prob;
+      next[matchId] = matchOverrides;
+      return next;
+    });
+  };
+
+  // 2. The Auto-Balancer Engine (Always enforces 100% sum)
+  const handleUpdateSplit = (matchId, gw, newProbRaw) => {
+    setFixtureOverrides(prev => {
+      const next = { ...prev };
+      const matchOverrides = { ...next[matchId] };
+      
+      let newProb = Math.min(Math.max(parseFloat(newProbRaw), 0), 1);
+      const oldProb = matchOverrides[gw] || 0;
+      let diff = newProb - oldProb;
+      
+      // Find all OTHER gameweeks that are already fully configured (ignoring blanks)
+      const otherGws = Object.keys(matchOverrides).filter(k => k !== String(gw) && !k.startsWith('unselected'));
+      
+      if (otherGws.length > 0 && diff !== 0) {
+        if (otherGws.length === 1) {
+          // If 2 total GWs, modifying one perfectly scales the other
+          let otherProb = matchOverrides[otherGws[0]] - diff;
+          otherProb = Math.min(Math.max(otherProb, 0), 1);
+          matchOverrides[otherGws[0]] = otherProb;
+          newProb = 1 - otherProb; 
+        } else {
+          // If 3+ GWs, distribute the remainder proportionally
+          let sumOthers = otherGws.reduce((acc, key) => acc + matchOverrides[key], 0);
+          if (sumOthers === 0) {
+              matchOverrides[otherGws[0]] = 1 - newProb;
+          } else {
+              const targetOthersSum = 1 - newProb;
+              otherGws.forEach(k => {
+                  matchOverrides[k] = (matchOverrides[k] / sumOthers) * targetOthersSum;
+              });
+          }
+        }
+      }
+      
+      matchOverrides[gw] = newProb;
+      next[matchId] = matchOverrides;
+      return next;
+    });
+  };
+
+  // Deleting a row gives its probability to the remaining rows
+  const handleRemoveSplit = (matchId, gw) => {
+    setFixtureOverrides(prev => {
+      const next = { ...prev };
+      const matchOverrides = { ...next[matchId] };
+      const deletedProb = matchOverrides[gw] || 0;
+      delete matchOverrides[gw];
+      
+      const remaining = Object.keys(matchOverrides).filter(k => !k.startsWith('unselected'));
+      if (remaining.length > 0 && deletedProb > 0) {
+         if (remaining.length === 1) {
+             matchOverrides[remaining[0]] += deletedProb;
+         } else {
+             let sumRem = remaining.reduce((a, k) => a + matchOverrides[k], 0);
+             if(sumRem === 0) {
+                 matchOverrides[remaining[0]] = 1.0;
+             } else {
+                 remaining.forEach(k => {
+                     matchOverrides[k] += (matchOverrides[k] / sumRem) * deletedProb;
+                 });
+             }
+         }
+      }
+
+      if (Object.keys(matchOverrides).length === 0) delete next[matchId];
+      else next[matchId] = matchOverrides;
+      
+      return next;
+    });
+  };
+
+  const handleRemoveEntireOverride = (matchId) => {
+    setFixtureOverrides(prev => {
+      const next = { ...prev };
+      delete next[matchId];
+      return next;
+    });
+  };
+
+  return (
+    <div className="flex flex-col gap-4 flex-1 h-full">
+      
+      {/* Header */}
+      <div className="flex items-center justify-between">
+        <p className="text-[10px] text-slate-500 leading-relaxed max-w-[70%]">
+          Override schedules & EV splits. Only customized fixtures are displayed below.
+        </p>
+        {Object.keys(fixtureOverrides).length > 0 && (
+          <button onClick={() => { if(window.confirm("Reset all?")) setFixtureOverrides({}); }} className="text-[10px] font-bold text-red-400 hover:text-red-300 uppercase tracking-wider bg-red-500/10 px-2 py-1 rounded transition-colors">
+            Reset All
+          </button>
+        )}
+      </div>
+
+      {/* Fixture Search Bar & Admin Tools */}
+      <div className="relative flex gap-2">
+        <div className="flex-1 flex items-center bg-slate-900 border border-slate-700 rounded-lg px-3 focus-within:border-indigo-500 transition-colors shadow-inner relative">
+          {/* Secret Click Zone */}
+          <div className="absolute left-0 w-10 h-full flex items-center justify-center cursor-pointer z-10" onClick={handleSecretClick}>
+             <Search size={14} className="text-slate-500 pointer-events-none" />
+          </div>
+          
+          <input 
+            type="text" 
+            placeholder="Search team to add override..." 
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            className="w-full bg-transparent py-2 pl-6 text-xs font-bold text-slate-200 outline-none"
+          />
+          {search && <button onClick={() => setSearch("")} className="text-slate-500 hover:text-white z-10"><X size={14}/></button>}
+        </div>
+
+        {/* Admin Login UI */}
+        {showAdminLogin && !isAdmin && (
+          <div className="flex gap-2 animate-in fade-in slide-in-from-left-4 duration-300">
+            <input type="password" placeholder="Admin Pass" value={adminPassword} onChange={(e) => setAdminPassword(e.target.value)} onKeyDown={(e) => e.key === 'Enter' && setIsAdmin(true)} className="bg-slate-950 border border-slate-700 rounded py-1.5 px-3 text-xs w-28 outline-none focus:border-orange-500 text-slate-200" />
+            <button onClick={() => setIsAdmin(true)} className="bg-slate-700 hover:bg-slate-600 px-3 rounded text-xs text-white transition-colors">Login</button>
+          </div>
+        )}
+
+        {isAdmin && (
+          <button onClick={handlePublishGlobal} className="animate-in fade-in zoom-in bg-orange-600 hover:bg-orange-500 text-white font-bold text-xs px-3 py-1.5 rounded shadow-lg transition-colors flex items-center gap-1 ml-2">
+            <Database size={12} /> Publish Globally
+          </button>
+        )}
+
+        {/* Search Results Dropdown */}
+        {search && (
+          <div className="absolute top-full left-0 w-full mt-1 bg-slate-800 border border-slate-600 rounded-lg shadow-2xl overflow-hidden z-50">
+            {searchResults.length === 0 ? (
+              <div className="p-3 text-xs text-slate-400 italic">No matches found...</div>
+            ) : (
+              searchResults.map(match => (
+                <button 
+                  key={match.id} 
+                  onClick={() => handleAddOverride(match)}
+                  className="w-full flex items-center justify-between p-3 border-b border-slate-700/50 hover:bg-slate-700 transition-colors text-left"
+                >
+                  <div className="flex items-center gap-2">
+                    <span className="text-xs font-black text-slate-200">{match.homeTeam}</span>
+                    <span className="text-[9px] text-slate-500 font-bold uppercase">vs</span>
+                    <span className="text-xs font-black text-slate-200">{match.awayTeam}</span>
+                  </div>
+                  <span className="text-[10px] font-bold text-slate-400 bg-slate-900 px-2 py-1 rounded">GW{match.defaultGw}</span>
+                </button>
+              ))
+            )}
+          </div>
+        )}
+      </div>
+
+      {/* Active Overrides List */}
+      <div className="flex flex-col gap-3 overflow-y-auto custom-scrollbar pr-2 pb-4">
+        {activeSplits.length === 0 ? (
+          <div className="flex flex-col items-center justify-center py-10 opacity-40">
+            <Zap size={32} className="text-slate-500 mb-2" />
+            <span className="text-xs font-bold text-slate-400 uppercase tracking-widest">No Active Overrides</span>
+          </div>
+        ) : (
+          activeSplits.map(match => {
+            const overrides = effectiveFixtures[match.id];
+            
+            return (
+              <div key={match.id} className="flex flex-col bg-slate-900 border border-indigo-500/50 shadow-[0_0_15px_rgba(99,102,241,0.1)] rounded-xl overflow-hidden">
+                
+                {/* Match Header */}
+                <div className="flex items-center justify-between px-3 py-2 bg-slate-950/50 border-b border-indigo-500/20">
+                  <div className="flex items-center gap-2">
+                    <span className="text-xs font-black text-slate-300">{match.homeTeam}</span>
+                    <span className="text-[9px] text-slate-600 font-bold uppercase tracking-widest">vs</span>
+                    <span className="text-xs font-black text-slate-300">{match.awayTeam}</span>
+                  </div>
+                  <button onClick={() => handleRemoveEntireOverride(match.id)} className="text-slate-500 hover:text-red-400 transition-colors" title="Remove Override">
+                    <X size={14} />
+                  </button>
+                </div>
+
+                {/* Sliders / Override UI */}
+                <div className="p-3 flex flex-col gap-3 bg-indigo-950/10">
+                  {Object.entries(overrides).map(([gw, prob]) => {
+                    // Check if this row is an empty placeholder waiting for a selection
+                    const isUnselected = gw.startsWith('unselected');
+
+                    return (
+                      <div key={gw} className="flex items-center gap-3">
+                        <select 
+                          value={isUnselected ? "" : gw} 
+                          onChange={(e) => handleChangeSplitGw(match.id, gw, e.target.value)}
+                          className={`bg-slate-950 border text-xs font-bold rounded px-1 py-1 outline-none w-[76px] transition-colors ${isUnselected ? 'border-dashed border-indigo-500/80 text-indigo-200' : 'border-indigo-500/30 text-indigo-300'}`}
+                        >
+                          {isUnselected && <option value="" disabled>Select GW</option>}
+                          {availableGWs.map(g => {
+                            // Don't show gameweeks that are already selected in another row for this match
+                            const isAlreadySelected = Object.keys(overrides).includes(String(g)) && String(g) !== String(gw);
+                            return !isAlreadySelected && <option key={g} value={g}>GW{g}</option>;
+                          })}
+                        </select>
+                        
+                        {/* 1% Step Sliders, locked if no GW is selected */}
+                        <input 
+                          type="range" min="0" max="1" step="0.01" 
+                          value={prob} 
+                          disabled={isUnselected}
+                          onChange={(e) => handleUpdateSplit(match.id, gw, e.target.value)}
+                          className={`flex-1 accent-indigo-500 ${isUnselected ? 'opacity-30 cursor-not-allowed' : 'cursor-ew-resize'}`}
+                        />
+                        
+                        {/* Editable Number Input with rounding and boundaries */}
+                        <div className="relative flex items-center">
+                          <input
+                            type="number"
+                            min="0"
+                            max="100"
+                            step="1"
+                            disabled={isUnselected}
+                            value={Math.round(prob * 100)}
+                            onChange={(e) => {
+                              let val = Math.round(Number(e.target.value));
+                              if (isNaN(val)) val = 0;
+                              if (val > 100) val = 100;
+                              if (val < 0) val = 0;
+                              handleUpdateSplit(match.id, gw, val / 100);
+                            }}
+                            className={`w-14 bg-slate-900 border border-indigo-500/30 text-indigo-300 text-xs font-bold rounded px-1 py-1 outline-none text-right pr-4 transition-colors ${isUnselected ? 'opacity-30 cursor-not-allowed' : 'hover:border-indigo-500/80 focus:border-indigo-400'}`}
+                          />
+                          <span className={`absolute right-1.5 text-[10px] font-bold text-indigo-400 pointer-events-none ${isUnselected ? 'opacity-30' : ''}`}>%</span>
+                        </div>
+
+                        <button onClick={() => handleRemoveSplit(match.id, gw)} className="text-slate-600 hover:text-red-400 p-1">
+                          <Trash2 size={14} />
+                        </button>
+                      </div>
+                    );
+                  })}
+                  
+                  {/* Footer: Add Row & EV Sum Validator */}
+                  <div className="flex justify-between items-center mt-1 border-t border-indigo-500/20 pt-2">
+                    <button onClick={() => handleAddSplitGw(match.id)} className="flex items-center gap-1 text-[9px] font-bold uppercase tracking-wider text-indigo-400 hover:text-indigo-300 transition-colors bg-indigo-900/30 px-2 py-1 rounded">
+                      <Plus size={12} /> Add GW Split
+                    </button>
+                    
+                    {(() => {
+                      const totalProb = Object.values(overrides).reduce((a, b) => a + b, 0);
+                      const isBalanced = Math.abs(totalProb - 1.0) < 0.01;
+                      return (
+                        <span className={`text-[9px] font-bold uppercase tracking-wider flex items-center gap-1 ${isBalanced ? 'text-emerald-500' : 'text-red-500'}`}>
+                          {isBalanced ? <Zap size={10} /> : null}
+                          Total: {Math.round(totalProb * 100)}%
+                        </span>
+                      );
+                    })()}
+                  </div>
+                </div>
+              </div>
+            );
+          })
+        )}
+      </div>
+    </div>
+  );
+};

frontend/src/components/Fixtures.jsx

@@ -0,0 +1,143 @@
+import React, { useState, useEffect, useContext } from 'react';
+import { getShortName } from '../utils/teams';
+import { PlayerContext } from '../PlayerContext';
+
+export default function Fixtures() {
+  const [fixtures, setFixtures] = useState([]);
+  const [isLoading, setIsLoading] = useState(true);
+
+  useEffect(() => {
+    fetch('https://anayshukla-fpl-solver.hf.space/api/fixtures')
+      .then(res => res.json())
+      .then(data => {
+        setFixtures(data);
+        setIsLoading(false);
+      });
+  }, []);
+
+  if (isLoading) return <div className="text-luigi-400 animate-pulse p-8">Loading fixtures...</div>;
+
+  const { effectiveFixtures } = useContext(PlayerContext);
+
+  const TEAM_MAP = {
+    "Arsenal": 1, "Aston Villa": 2, "Burnley": 3, "AFC Bournemouth": 4, "Brentford": 5,
+    "Brighton": 6, "Chelsea": 7, "Crystal Palace": 8, "Everton": 9, "Fulham": 10,
+    "Leeds United": 11, "Liverpool": 12, "Man City": 13, "Manchester City": 13, 
+    "Man Utd": 14, "Manchester United": 14, "Newcastle": 15, "Newcastle United": 15,
+    "Nott'm Forest": 16, "Nottingham Forest": 16, "Sunderland": 17, 
+    "Spurs": 18, "Tottenham": 18, "Tottenham Hotspur": 18, 
+    "West Ham": 19, "West Ham United": 19, "Wolves": 20, "Wolverhampton Wanderers": 20
+  };
+
+  const expandedFixtures = [];
+
+  fixtures.forEach(match => {
+    const hId = match.home_team_id || TEAM_MAP[match.home_team] || match.home_team;
+    const aId = match.away_team_id || TEAM_MAP[match.away_team] || match.away_team;
+    const matchId = `${hId}_vs_${aId}`;
+
+    const override = effectiveFixtures?.[matchId];
+
+    if (override) {
+      Object.entries(override).forEach(([gw, prob]) => {
+        // THE FIX: Prevent floating point ghost fixtures (must be >= 0.5%)
+        if (Number(prob) >= 0.005) {
+          expandedFixtures.push({ ...match, GW: Number(gw), shiftProb: Number(prob) });
+        }
+      });
+    } else {
+      expandedFixtures.push({ ...match, shiftProb: 1.0 });
+    }
+  });
+
+  const groupedFixtures = expandedFixtures.reduce((acc, match) => {
+    (acc[match.GW] = acc[match.GW] || []).push(match);
+    return acc;
+  }, {});
+
+  return (
+    <div className="space-y-8">
+      {Object.entries(groupedFixtures).map(([gw, matches]) => (
+        <div key={gw} className="bg-slate-900/40 p-6 rounded-xl border border-slate-800 backdrop-blur-sm shadow-xl">
+          <h3 className="text-xl font-bold text-luigi-400 mb-4 border-b border-slate-800 pb-2">Gameweek {gw}</h3>
+          
+          <div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
+            {matches.map((match, idx) => {
+              
+              const hw = match.home_win_prob;
+              const aw = match.away_win_prob;
+              const isGhost = match.shiftProb < 0.995;
+
+              const homeBox = hw > aw ? 'text-emerald-400 bg-emerald-900/30' : (hw < aw ? 'text-rose-400 bg-rose-900/30' : 'text-slate-300 bg-slate-800/50');
+              const awayBox = aw > hw ? 'text-emerald-400 bg-emerald-900/30' : (aw < hw ? 'text-rose-400 bg-rose-900/30' : 'text-slate-300 bg-slate-800/50');
+              
+              const ghostStyles = isGhost 
+                ? "border-dashed border-indigo-500/50 opacity-80 bg-[repeating-linear-gradient(45deg,transparent,transparent_10px,rgba(99,102,241,0.05)_10px,rgba(99,102,241,0.05)_20px)]" 
+                : "border-slate-800/80 hover:border-slate-600";
+
+              return (
+                <div 
+                  key={`${idx}-${match.shiftProb}`} 
+                  title={isGhost ? `${Math.round(match.shiftProb * 100)}% chance of playing in GW${gw}` : `Confirmed Fixture`}
+                  className={`relative bg-slate-950 rounded-lg border overflow-hidden shadow-lg transition-colors ${ghostStyles}`}
+                >
+                  {isGhost && (
+                    <div className="absolute top-2 right-2 bg-indigo-900/80 text-indigo-300 text-[10px] font-black px-2 py-0.5 rounded border border-indigo-500/50 backdrop-blur-md z-10 shadow-lg">
+                      {Math.round(match.shiftProb * 100)}% Chance
+                    </div>
+                  )}
+                  
+                  {/* Header: Teams & xG */}
+                  <div className="bg-slate-900/80 px-4 py-3 flex justify-between items-center border-b border-slate-800">
+                    <div className="flex flex-col items-center w-1/3">
+                      <span className="text-lg font-bold text-slate-100">{getShortName(match.home_team)}</span>
+                      {/* UPDATED: Larger, bolder xG text */}
+                      <span className="text-base font-mono font-bold text-slate-300 mt-1">
+                        {match.expected_home_goals.toFixed(2)} xG
+                      </span>
+                    </div>
+                    
+                    <span className="text-slate-600 text-xs font-bold uppercase tracking-widest bg-slate-950 px-2 py-1 rounded-full border border-slate-800">vs</span>
+                    
+                    <div className="flex flex-col items-center w-1/3">
+                      <span className="text-lg font-bold text-slate-100">{getShortName(match.away_team)}</span>
+                      {/* UPDATED: Larger, bolder xG text */}
+                      <span className="text-base font-mono font-bold text-slate-300 mt-1">
+                        {match.expected_away_goals.toFixed(2)} xG
+                      </span>
+                    </div>
+                  </div>
+
+                  {/* Body: Probabilities & Clean Sheets */}
+                  <div className="p-3">
+                    <div className="flex justify-between text-[10px] text-slate-400 font-mono text-center mb-3">
+                      <div className="flex flex-col w-[30%]">
+                        <span className="mb-1">HOME WIN</span>
+                        <span className={`text-sm py-1 rounded font-bold ${homeBox}`}>{(match.home_win_prob * 100).toFixed(1)}%</span>
+                      </div>
+                      <div className="flex flex-col w-[30%]">
+                        <span className="mb-1">DRAW</span>
+                        <span className="text-slate-300 text-sm bg-slate-800/30 py-1 rounded font-bold">{(match.draw_prob * 100).toFixed(1)}%</span>
+                      </div>
+                      <div className="flex flex-col w-[30%]">
+                        <span className="mb-1">AWAY WIN</span>
+                        <span className={`text-sm py-1 rounded font-bold ${awayBox}`}>{(match.away_win_prob * 100).toFixed(1)}%</span>
+                      </div>
+                    </div>
+
+                    {/* Clean Sheet Odds */}
+                    <div className="flex justify-between border-t border-slate-800/50 pt-2 text-xs">
+                      <div className="text-slate-400">Home CS: <span className="text-luigi-400 font-mono font-bold">{(match.home_clean_sheet_odds * 100).toFixed(1)}%</span></div>
+                      <div className="text-slate-400">Away CS: <span className="text-luigi-400 font-mono font-bold">{(match.away_clean_sheet_odds * 100).toFixed(1)}%</span></div>
+                    </div>
+                  </div>
+
+                </div>
+              );
+            })}
+          </div>
+        </div>
+      ))}
+    </div>
+  );
+}

frontend/src/components/LandingPage.jsx

@@ -0,0 +1,76 @@
+import React, { useState } from "react";
+import { Target, TrendingUp, Shield } from "lucide-react";
+import LoginModal from "./LoginModal"; // Fixed import syntax
+
+// Adjust these paths depending on exactly where your images are saved in your src folder!
+
+export const LandingPage = () => {
+  const [showLoginModal, setShowLoginModal] = useState(false);
+
+  return (
+    <div className="min-h-screen flex flex-col items-center justify-center relative overflow-hidden bg-slate-950">
+      
+      {/* Epic Mansion Background */}
+      <div 
+        className="absolute inset-0 z-0 bg-cover bg-center bg-no-repeat opacity-40 mix-blend-luminosity"
+        style={{ backgroundImage: `url(/luigismansion.jpg)` }}
+      />
+      
+      {/* Gradient Overlay to ensure text remains highly readable */}
+      <div className="absolute inset-0 z-0 bg-gradient-to-b from-slate-950/90 via-slate-900/60 to-slate-950/90" />
+
+      <div className="z-10 flex flex-col items-center text-center px-4 max-w-3xl mt-[-5vh]">
+        
+        {/* Glowing Luigi Orb */}
+        <div className="w-28 h-28 bg-slate-900/80 border-2 border-luigi-500/50 rounded-full flex items-center justify-center mb-6 shadow-[0_0_40px_rgba(16,185,129,0.5)] backdrop-blur-md p-3 transition-transform hover:scale-105 duration-500">
+          <img src="/icon.jpg" alt="Luigi's Mansion" className="w-full h-full object-contain drop-shadow-2xl" />
+        </div>
+
+        <h1 className="text-6xl md:text-8xl font-black text-white mb-6 tracking-tighter drop-shadow-2xl">
+          Welcome to <br />
+          <span className="text-transparent bg-clip-text bg-gradient-to-r from-luigi-400 via-emerald-400 to-luigi-600 drop-shadow-[0_0_20px_rgba(16,185,129,0.6)]">
+            Luigi's Mansion
+          </span>
+        </h1>
+
+        <p className="text-xl md:text-2xl font-bold text-slate-300 mb-12 max-w-2xl leading-relaxed drop-shadow-lg">
+          Luigi's Mansion is here. New, improved, and simply Wieffertastic.
+        </p>
+
+        <button
+          onClick={() => setShowLoginModal(true)}
+          className="px-10 py-5 bg-gradient-to-r from-luigi-600 to-emerald-800 hover:from-luigi-500 hover:to-emerald-600 text-white font-black rounded-xl text-xl transition-all shadow-[0_0_30px_rgba(16,185,129,0.4)] hover:shadow-[0_0_50px_rgba(16,185,129,0.8)] hover:-translate-y-1 uppercase tracking-widest border border-luigi-400/50"
+        >
+          Enter the Mansion
+        </button>
+
+        {/* Feature Highlights */}
+        <div className="grid grid-cols-1 md:grid-cols-3 gap-6 mt-20 text-left w-full max-w-4xl relative z-10">
+          <div className="bg-slate-950/60 backdrop-blur-md border border-slate-800/80 p-5 rounded-2xl hover:border-luigi-500/30 transition-colors">
+            <Target className="text-luigi-400 mb-3" size={24} />
+            <h3 className="text-slate-200 font-bold mb-1">In-built Solver</h3>
+            <p className="text-slate-400 text-sm">With a horizon of 10 gameweeks and 5 drafts to allow you to solve for different scenarios.</p>
+          </div>
+          <div className="bg-slate-950/60 backdrop-blur-md border border-slate-800/80 p-5 rounded-2xl hover:border-cyan-500/30 transition-colors">
+            <TrendingUp className="text-cyan-400 mb-3" size={24} />
+            <h3 className="text-slate-200 font-bold mb-1">Editable Projections</h3>
+            <p className="text-slate-400 text-sm">Real-time projections adjustment based on your xMins inputs. </p>
+          </div>
+          <div className="bg-slate-950/60 backdrop-blur-md border border-slate-800/80 p-5 rounded-2xl hover:border-purple-500/30 transition-colors">
+            <Shield className="text-purple-400 mb-3" size={24} />
+            <h3 className="text-slate-200 font-bold mb-1">Cloud Synced</h3>
+            <p className="text-slate-400 text-sm">Your squad, manual edits, and settings are securely saved to your account.</p>
+          </div>
+        </div>
+      </div>
+
+      {/* Render the actual Login Modal safely on top of EVERYTHING */}
+      {showLoginModal && (
+        <div className="fixed inset-0 z-[9999] flex items-center justify-center">
+          {/* THE FIX: We must explicitly pass isOpen={true} to bypass the modal's internal null check */}
+          <LoginModal isOpen={true} onClose={() => setShowLoginModal(false)} />
+        </div>
+      )}
+    </div>
+  );
+};

frontend/src/components/LoginModal.jsx

@@ -0,0 +1,231 @@
+import React, { useState, useContext } from 'react';
+import { X, Mail, Lock, Loader2, Shield, Eye, EyeOff } from 'lucide-react';
+import { PlayerContext } from '../PlayerContext';
+import { GoogleLogin } from '@react-oauth/google';
+
+export default function LoginModal({ isOpen, onClose }) {
+  const { setIsLoggedIn, setUserProfile, setHasGuestMadeEdits } = useContext(PlayerContext);
+  
+  const [isSignUp, setIsSignUp] = useState(false);
+  const [email, setEmail] = useState('');
+  const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  
+  const [showPassword, setShowPassword] = useState(false);
+  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+  
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState('');
+
+  if (!isOpen) return null;
+
+  const toggleMode = () => {
+    setIsSignUp(!isSignUp);
+    setError('');
+    setPassword('');
+    setConfirmPassword('');
+  };
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    setIsLoading(true);
+    setError('');
+
+    // Reconfirmation Validation for Sign Up
+    if (isSignUp && password !== confirmPassword) {
+      setError('Passwords do not match!');
+      setIsLoading(false);
+      return;
+    }
+
+    const endpoint = isSignUp ? '/api/auth/register' : '/api/auth/login';
+
+    try {
+      const res = await fetch(`https://anayshukla-fpl-solver.hf.space${endpoint}`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ email, password })
+      });
+
+      const data = await res.json();
+
+      if (!res.ok) {
+        throw new Error(data.detail || 'Authentication failed');
+      }
+
+      // Success! Save token and update Global Context
+      localStorage.setItem('fpl_token', data.access_token);
+      
+      setUserProfile({
+        username: data.email.split('@')[0],
+        defaultTeamId: null, 
+        isAdmin: data.is_admin
+      });
+      
+      setIsLoggedIn(true);
+      setHasGuestMadeEdits(false); 
+      onClose();
+
+    } catch (err) {
+      setError(err.message);
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return (
+    <div className="fixed inset-0 z-[200] flex items-center justify-center bg-black/80 backdrop-blur-sm p-4">
+      <div className="bg-slate-950 border border-slate-800 w-full max-w-md rounded-2xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-200">
+        
+        {/* Header */}
+        <div className="bg-slate-900 p-5 flex justify-between items-center border-b border-slate-800">
+          <div className="flex items-center gap-3">
+            <div className="w-8 h-8 bg-luigi-500/20 text-luigi-400 rounded-lg flex items-center justify-center">
+              <Shield size={18} />
+            </div>
+            <h2 className="text-xl font-black text-slate-100">
+              {isSignUp ? 'Create Account' : 'Welcome Back'}
+            </h2>
+          </div>
+          <button onClick={onClose} className="text-slate-500 hover:text-white transition-colors bg-slate-950 p-1.5 rounded-full border border-slate-800">
+            <X size={18} />
+          </button>
+        </div>
+
+        {/* Body */}
+        <div className="p-6">
+          {error && (
+            <div className="mb-4 p-3 bg-red-950/30 border border-red-900/50 text-red-400 text-sm rounded-lg text-center font-bold">
+              {error}
+            </div>
+          )}
+
+          <form onSubmit={handleSubmit} className="flex flex-col gap-4">
+            {/* Email Field */}
+            <div className="relative">
+              <Mail className="absolute left-3 top-1/2 -translate-y-1/2 text-slate-500" size={16} />
+              <input 
+                type="email" 
+                required
+                placeholder="Email Address" 
+                value={email}
+                onChange={(e) => setEmail(e.target.value)}
+                className="w-full bg-slate-900 border border-slate-700 rounded-xl py-3 pl-10 pr-4 text-sm text-slate-200 focus:outline-none focus:border-luigi-400 transition-colors"
+              />
+            </div>
+
+            {/* Password Field */}
+            <div className="relative">
+              <Lock className="absolute left-3 top-1/2 -translate-y-1/2 text-slate-500" size={16} />
+              <input 
+                type={showPassword ? "text" : "password"} 
+                required
+                placeholder="Password" 
+                value={password}
+                onChange={(e) => setPassword(e.target.value)}
+                className="w-full bg-slate-900 border border-slate-700 rounded-xl py-3 pl-10 pr-10 text-sm text-slate-200 focus:outline-none focus:border-luigi-400 transition-colors"
+              />
+              <button 
+                type="button"
+                onClick={() => setShowPassword(!showPassword)}
+                className="absolute right-3 top-1/2 -translate-y-1/2 text-slate-500 hover:text-slate-300 transition-colors"
+              >
+                {showPassword ? <EyeOff size={16} /> : <Eye size={16} />}
+              </button>
+            </div>
+
+            {/* Confirm Password Field (Only for Sign Up) */}
+            {isSignUp && (
+              <div className="relative animate-in slide-in-from-top-2 fade-in duration-200">
+                <Lock className="absolute left-3 top-1/2 -translate-y-1/2 text-slate-500" size={16} />
+                <input 
+                  type={showConfirmPassword ? "text" : "password"} 
+                  required
+                  placeholder="Confirm Password" 
+                  value={confirmPassword}
+                  onChange={(e) => setConfirmPassword(e.target.value)}
+                  className={`w-full bg-slate-900 border rounded-xl py-3 pl-10 pr-10 text-sm text-slate-200 focus:outline-none transition-colors ${
+                    confirmPassword && password !== confirmPassword 
+                      ? "border-red-500/50 focus:border-red-500" 
+                      : "border-slate-700 focus:border-luigi-400"
+                  }`}
+                />
+                <button 
+                  type="button"
+                  onClick={() => setShowConfirmPassword(!showConfirmPassword)}
+                  className="absolute right-3 top-1/2 -translate-y-1/2 text-slate-500 hover:text-slate-300 transition-colors"
+                >
+                  {showConfirmPassword ? <EyeOff size={16} /> : <Eye size={16} />}
+                </button>
+              </div>
+            )}
+
+            <button 
+              type="submit" 
+              disabled={isLoading}
+              className="w-full bg-luigi-500 hover:bg-luigi-400 text-slate-950 py-3 rounded-xl font-bold text-sm transition-colors shadow-lg shadow-luigi-500/20 flex justify-center items-center mt-2"
+            >
+              {isLoading ? <Loader2 size={18} className="animate-spin" /> : (isSignUp ? 'Create Account' : 'Log In')}
+            </button>
+          </form>
+
+          {/* Toggle Login/Signup Mode */}
+          <div className="mt-6 flex items-center justify-between text-sm text-slate-500">
+            <span>{isSignUp ? 'Already have an account?' : "Don't have an account?"}</span>
+            <button 
+              onClick={toggleMode}
+              className="text-luigi-400 font-bold hover:underline"
+            >
+              {isSignUp ? 'Log In' : 'Sign Up'}
+            </button>
+          </div>
+
+          {/* Elegant "OR" Divider */}
+          <div className="mt-6 mb-2 relative flex items-center justify-center">
+            <div className="absolute inset-0 flex items-center">
+              <div className="w-full border-t border-slate-800"></div>
+            </div>
+            <div className="relative px-4 bg-slate-950 text-xs font-bold text-slate-500 uppercase tracking-widest">
+              OR
+            </div>
+          </div>
+
+          {/* Google Login Block */}
+          <div className="mt-4 flex justify-center">
+            <GoogleLogin
+              text={isSignUp ? "signup_with" : "signin_with"}
+              onSuccess={async (credentialResponse) => {
+                try {
+                  const res = await fetch('https://anayshukla-fpl-solver.hf.space/api/auth/google', {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({ token: credentialResponse.credential })
+                  });
+                  const data = await res.json();
+                  if (!res.ok) throw new Error(data.detail || "Google Auth Failed");
+                  
+                  localStorage.setItem('fpl_token', data.access_token);
+                  setUserProfile({
+                    username: data.email.split('@')[0],
+                    defaultTeamId: null,
+                    isAdmin: data.is_admin
+                  });
+                  setIsLoggedIn(true);
+                  setHasGuestMadeEdits(false);
+                  onClose();
+                } catch (err) {
+                  setError(err.message);
+                }
+              }}
+              onError={() => {
+                setError('Google Login window closed or failed.');
+              }}
+              theme="filled_black"
+              shape="pill"
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

frontend/src/components/PitchView.jsx

@@ -0,0 +1,100 @@
+// src/components/PitchView.jsx
+import React from "react";
+import { DraggablePlayer } from "./DraggablePlayer";
+
+export const PitchView = ({
+  teamData,
+  activeDragPlayer,
+  isValidSwap,
+  captainId,
+  viceId,
+  handleCapChange,
+  playerCardGWs,
+  fixtures,
+  activeGW,
+  setSelectedPlayer,
+  handleUndoTransfer,
+  highlightTransferIds,
+  solverTransferPairs,
+  resetHighlightedTransfer,
+  chipsByGw,
+}) => {
+  return (
+    <div className="w-full bg-[#0a3a2a] rounded-2xl border-4 border-[#072a1e] min-h-[650px] xl:min-h-[850px] relative overflow-hidden flex flex-col shadow-[0_0_50px_rgba(0,0,0,0.5)]">
+      {/* PITCH LINES */}
+      <div className="absolute inset-0 pointer-events-none opacity-30 flex flex-col items-center">
+        <div className="w-full h-1/2 border-b-2 border-white/40 absolute top-0"></div>
+        <div className="w-48 h-48 sm:w-64 sm:h-64 border-2 border-white/40 rounded-full absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2"></div>
+        <div className="w-2 h-2 bg-white/40 rounded-full absolute top-1/2 left-1/2 -translate-x-1/2 -translate-y-1/2"></div>
+        <div className="w-[50%] sm:w-[40%] h-[15%] border-2 border-white/40 absolute top-0 left-1/2 -translate-x-1/2 border-t-0"></div>
+        <div className="w-[20%] sm:w-[15%] h-[5%] border-2 border-white/40 absolute top-0 left-1/2 -translate-x-1/2 border-t-0"></div>
+        <div className="w-[50%] sm:w-[40%] h-[15%] border-2 border-white/40 absolute bottom-0 left-1/2 -translate-x-1/2 border-b-0"></div>
+        <div className="w-[20%] sm:w-[15%] h-[5%] border-2 border-white/40 absolute bottom-0 left-1/2 -translate-x-1/2 border-b-0"></div>
+      </div>
+
+      {/* STARTERS */}
+      <div className="flex-1 w-full overflow-x-auto custom-scrollbar">
+        <div className="flex flex-col justify-evenly gap-y-10 z-10 pt-8 pb-12 px-4 min-w-max sm:min-w-0 min-h-full h-full mx-auto">
+          {["G", "D", "M", "F"].map((pos) => {
+            const rowPlayers = teamData.slice(0, 11).filter((p) => p.Pos === pos);
+            if (rowPlayers.length === 0) return null;
+            return (
+              <div key={pos} className="flex justify-center gap-[26px] sm:gap-8 md:gap-12 xl:gap-16 w-full px-2">
+                {rowPlayers.map((p) => (
+                  <DraggablePlayer
+                    key={p.ID}
+                    player={p}
+                    isBench={false}
+                    isActiveDrag={activeDragPlayer !== null}
+                    isValidTarget={isValidSwap(activeDragPlayer, p)}
+                    captainId={captainId}
+                    viceId={viceId}
+                    handleCapChange={handleCapChange}
+                    playerCardGWs={playerCardGWs}
+                    fixtures={fixtures}
+                    activeGW={activeGW}
+                    onPlayerClick={(player) => setSelectedPlayer(player)}
+                    onUndo={handleUndoTransfer}
+                    isHighlighted={Array.from(highlightTransferIds[activeGW] || []).includes(p.ID)}
+                    onSolverUndo={(solverTransferPairs[activeGW] || {})[p.ID] ? () => resetHighlightedTransfer(p) : undefined}
+                    activeChipType={chipsByGw[activeGW]}
+                  />
+                ))}
+              </div>
+            );
+          })}
+        </div>
+      </div>
+
+      {/* BENCH */}
+        <div
+          className={`mt-auto w-full border-t-2 z-10 transition-colors duration-300 overflow-x-auto custom-scrollbar ${chipsByGw[activeGW] === "bb" ? "bg-emerald-950/60 border-emerald-500/50 shadow-[0_0_24px_rgba(16,185,129,0.2)]" : "bg-slate-950/90 border-slate-800"
+            }`}
+        >
+          <div className="min-h-[140px] sm:min-h-[160px] md:min-h-[180px] min-w-max sm:min-w-0 mx-auto flex justify-center items-center gap-[26px] sm:gap-8 md:gap-12 xl:gap-16 pb-10 pt-6 px-4">
+            {teamData.slice(11, 15).map((p, benchIndex) => (
+              <DraggablePlayer
+                key={p.ID}
+                player={p}
+                isBench={true}
+                benchIndex={benchIndex}
+                isActiveDrag={activeDragPlayer !== null}
+                isValidTarget={isValidSwap(activeDragPlayer, p)}
+                captainId={captainId}
+                viceId={viceId}
+                handleCapChange={handleCapChange}
+                playerCardGWs={playerCardGWs}
+                fixtures={fixtures}
+                activeGW={activeGW}
+                onPlayerClick={(player) => setSelectedPlayer(player)}
+                onUndo={handleUndoTransfer}
+                isHighlighted={Array.from(highlightTransferIds[activeGW] || []).includes(p.ID)}
+                onSolverUndo={(solverTransferPairs[activeGW] || {})[p.ID] ? () => resetHighlightedTransfer(p) : undefined}
+                activeChipType={chipsByGw[activeGW]}
+              />
+            ))}
+          </div>
+        </div>
+    </div>
+  );
+};

frontend/src/components/PlayerCardVisual.jsx

@@ -0,0 +1,258 @@
+import React, { useContext } from "react";
+import { Plus, RotateCcw } from "lucide-react";
+import { getShortName } from "../utils/teams";
+import { getPlayerPrice } from "../utils/fplLogic";
+import { PlayerContext } from "../PlayerContext";
+
+export const PlayerCardVisual = ({
+  player,
+  isBench,
+  captainId,
+  viceId,
+  handleCapChange,
+  playerCardGWs,
+  fixtures,
+  activeGW,
+  onPlayerClick,
+  onUndo,
+  onSolverUndo,
+  activeChipType,
+}) => {
+  if (player.isBlank) {
+    return (
+      <div
+        onClick={onPlayerClick}
+        className="relative w-[64px] sm:w-[76px] md:w-[88px] h-[90px] sm:h-[105px] md:h-[120px] flex flex-col items-center justify-center cursor-pointer border-2 border-dashed border-slate-500 bg-slate-900/60 rounded-xl hover:bg-slate-800 hover:border-emerald-400 transition-all z-20 shadow-inner group"
+      >
+        {player.replacedPlayer && (
+          <div className="absolute left-[-14px] top-[-10px] flex flex-col gap-1 z-40 pointer-events-auto">
+            <button
+              onPointerDown={(e) => e.stopPropagation()}
+              onClick={(e) => onUndo(e, player.ID, player.replacedPlayer)}
+              className="w-6 h-6 flex items-center justify-center rounded-full bg-red-600 hover:bg-red-500 text-white shadow-[0_0_10px_rgba(220,38,38,0.5)] transition-colors border border-red-400"
+              title="Undo Transfer"
+            >
+              <RotateCcw size={12} strokeWidth={3} />
+            </button>
+          </div>
+        )}
+        <Plus
+          className="text-slate-500 group-hover:text-emerald-400 transition-colors mb-1"
+          size={24}
+        />
+        <span className="text-[10px] font-black text-slate-500 group-hover:text-emerald-400 uppercase tracking-widest">
+          {player.Pos}
+        </span>
+      </div>
+    );
+  }
+
+  const isCap = player.ID === captainId;
+  const isVice = player.ID === viceId;
+  const photoUrl = player.photo
+    ? `https://resources.premierleague.com/premierleague25/photos/players/110x140/${player.photo.replace(".jpg", ".png")}`
+    : "";
+
+  const { effectiveFixtures } = useContext(PlayerContext) || {};
+
+  const TEAM_MAP = {
+    "Arsenal": 1, "Aston Villa": 2, "Burnley": 3, "Bournemouth": 4, "AFC Bournemouth": 4, "Brentford": 5,
+    "Brighton": 6, "Brighton and Hove Albion": 6, "Chelsea": 7, "Crystal Palace": 8, "Everton": 9, "Fulham": 10,
+    "Leeds": 11, "Leeds United": 11, "Liverpool": 12, "Man City": 13, "Manchester City": 13,
+    "Man Utd": 14, "Manchester United": 14, "Newcastle": 15, "Newcastle United": 15,
+    "Nott'm Forest": 16, "Nottingham Forest": 16, "Sunderland": 17,
+    "Spurs": 18, "Tottenham": 18, "Tottenham Hotspur": 18,
+    "West Ham": 19, "West Ham United": 19, "Wolves": 20, "Wolverhampton Wanderers": 20
+  };
+
+  const getActiveMatches = (teamName, gw) => {
+    if (!fixtures || !fixtures.length || !gw) return [];
+    const activeMatches = [];
+    fixtures.forEach(m => {
+      if (m.home_team !== teamName && m.away_team !== teamName) return;
+
+      const hId = m.home_team_id || TEAM_MAP[m.home_team] || m.home_team;
+      const aId = m.away_team_id || TEAM_MAP[m.away_team] || m.away_team;
+      const matchId = `${hId}_vs_${aId}`;
+
+      const override = effectiveFixtures?.[matchId];
+
+      if (override) {
+        if (Number(override[gw]) >= 0.01) activeMatches.push({ ...m, prob: Number(override[gw]) });
+      } else if (String(m.GW) === String(gw)) {
+        activeMatches.push({ ...m, prob: 1.0 });
+      }
+    });
+    return activeMatches;
+  };
+
+  const currentGwMatches = getActiveMatches(player.Team, activeGW);
+  const isBlankThisGw = currentGwMatches.length === 0;
+
+  const renderFixtures = (teamName, gw) => {
+    const activeMatches = gw === activeGW ? currentGwMatches : getActiveMatches(teamName, gw);
+
+    if (activeMatches.length === 0) {
+      return <span className="text-[8.5px] font-bold text-slate-600">BLANK</span>;
+    }
+
+    return activeMatches.map((m, idx) => {
+      const isHome = m.home_team === teamName;
+      const oppName = getShortName(isHome ? m.away_team : m.home_team);
+      const loc = isHome ? "H" : "A";
+      const isGhost = m.prob < 1;
+
+      return (
+        <React.Fragment key={idx}>
+          <span
+            title={isGhost ? `${Math.round(m.prob * 100)}% chance of playing in GW${gw}` : undefined}
+            className={`inline-flex items-center whitespace-nowrap ${isGhost ? "text-indigo-200 cursor-help" : "text-slate-200"}`}
+          >
+            {/* Team Name - Scaled down 1px and tightened tracking */}
+            <span className="text-[8.5px] sm:text-[9.5px] font-black tracking-tighter leading-none">
+              {oppName}
+            </span>
+
+            {/* Location - Scaled down 1px */}
+            <span className={`text-[7.5px] sm:text-[8.5px] font-bold ml-[1.5px] leading-none ${isGhost ? "text-indigo-400" : "text-slate-400"}`}>
+              ({loc})
+            </span>
+
+            {/* Percentage Pill - Scaled down, tighter internal padding */}
+            {isGhost && (
+              <span
+                className="text-[6.5px] sm:text-[7.5px] font-black text-indigo-100 ml-[2px] bg-indigo-500/50 px-[3px] py-[1px] rounded-[2px] border border-indigo-400/40 tracking-tighter shadow-sm flex items-center justify-center"
+                style={{ lineHeight: 1 }}
+              >
+                {Math.round(m.prob * 100)}%
+              </span>
+            )}
+          </span>
+
+          {/* Divider - Margins shrunk from mx-[5px] to mx-[3px] */}
+          {idx < activeMatches.length - 1 && (
+            <span className="text-[7px] text-slate-500 mx-[3px] flex items-center leading-none">•</span>
+          )}
+        </React.Fragment>
+      );
+    });
+  };
+
+  const evStyles = [
+    "text-emerald-400 text-[15px] sm:text-base font-extrabold",
+    "text-emerald-500 text-[12px] sm:text-[13px] font-bold",
+    "text-emerald-600 text-[10px] sm:text-[11px] font-semibold",
+  ];
+
+  return (
+    <div
+      onClick={onPlayerClick}
+      className="relative w-[64px] sm:w-[76px] md:w-[88px] h-[90px] sm:h-[105px] md:h-[120px] flex flex-col items-center justify-end cursor-grab active:cursor-grabbing"
+    >
+      <div className="absolute left-[-14px] top-[-10px] flex flex-col gap-1 z-40 pointer-events-auto">
+        {!isBench && handleCapChange && (
+          <>
+            <button
+              onPointerDown={(e) => e.stopPropagation()}
+              onClick={(e) => {
+                e.stopPropagation();
+                handleCapChange(player.ID, "C");
+              }}
+              className={`w-6 h-6 flex items-center justify-center rounded-full text-[11px] font-bold transition-colors shadow-lg ${isCap
+                ? activeChipType === "tc"
+                  ? "bg-purple-500 text-white border border-purple-300 shadow-[0_0_10px_rgba(168,85,247,0.7)] text-[9px]"
+                  : "bg-yellow-400 text-slate-900 border border-white"
+                : "bg-slate-900/90 text-slate-400 border border-slate-700 hover:text-yellow-400"
+                }`}
+            >
+              {isCap && activeChipType === "tc" ? "TC" : "C"}
+            </button>
+            <button
+              onPointerDown={(e) => e.stopPropagation()}
+              onClick={(e) => {
+                e.stopPropagation();
+                handleCapChange(player.ID, "V");
+              }}
+              className={`w-6 h-6 flex items-center justify-center rounded-full text-[11px] font-bold transition-colors shadow-lg ${isVice ? "bg-slate-300 text-slate-900 border border-white" : "bg-slate-900/90 text-slate-400 border border-slate-700 hover:text-white"}`}
+            >
+              V
+            </button>
+          </>
+        )}
+        {onSolverUndo && (
+          <button
+            onPointerDown={(e) => e.stopPropagation()}
+            onClick={(e) => {
+              e.stopPropagation();
+              onSolverUndo(player);
+            }}
+            className="w-6 h-6 flex items-center justify-center rounded-full bg-red-600 hover:bg-red-500 text-white shadow-[0_0_10px_rgba(220,38,38,0.5)] transition-colors border border-red-400"
+            title="Revert solver transfer"
+          >
+            <RotateCcw size={12} strokeWidth={3} />
+          </button>
+        )}
+        {player.replacedPlayer && (
+          <button
+            onPointerDown={(e) => e.stopPropagation()}
+            onClick={(e) => onUndo(e, player.ID, player.replacedPlayer)}
+            className="w-6 h-6 flex items-center justify-center rounded-full bg-red-600 hover:bg-red-500 text-white shadow-[0_0_10px_rgba(220,38,38,0.5)] transition-colors border border-red-400"
+            title="Undo transfer"
+          >
+            <RotateCcw size={12} strokeWidth={3} />
+          </button>
+        )}
+      </div>
+
+      <div className="absolute right-[-16px] top-[-5px] flex flex-col items-end z-30 pointer-events-none drop-shadow-[0_1px_2px_rgba(0,0,0,0.8)]">
+        {playerCardGWs.map((gw, i) => (
+          <span key={gw} className={`${evStyles[i]} leading-tight tabular-nums`}>
+            {Number(player[`${gw}_Pts`] || 0).toFixed(2)}
+          </span>
+        ))}
+      </div>
+
+      {photoUrl ? (
+        <img
+          src={photoUrl}
+          alt={player.Name}
+          draggable="false"
+          className={`absolute bottom-[10px] w-full h-[85%] object-contain pointer-events-none z-10 drop-shadow-2xl ${isBench ? (activeChipType === "bb" ? "opacity-85" : "opacity-50") : "opacity-100"}`}
+        />
+      ) : (
+        <div
+          className={`absolute bottom-[10px] w-[80%] h-[70%] bg-slate-800/50 rounded-t-full z-10 pointer-events-none ${isBench ? (activeChipType === "bb" ? "opacity-85" : "opacity-50") : "opacity-100"}`}
+        />
+      )}
+
+      <div
+        draggable="false"
+        className={`absolute bottom-[-24px] sm:bottom-[-28px] w-[135%] flex flex-col items-center z-30 pointer-events-none ${isBench ? "opacity-80" : "opacity-100"}`}
+      >
+        <div className="w-full bg-slate-950 border border-slate-700 text-center py-[2px] truncate px-1 font-bold text-[10px] sm:text-[11px] text-slate-100 rounded-t shadow-md">
+          {player.Name}
+        </div>
+        <div className="w-full bg-slate-200 border-x border-slate-700 flex justify-center items-center gap-1.5 sm:gap-2 py-[2.5px] shadow-inner">
+          <span className={`text-[10px] sm:text-xs font-black flex items-baseline gap-0.5 ${isBlankThisGw ? 'text-slate-400' : 'text-slate-800'}`}>
+            {isBlankThisGw ? "-" : (player[`${activeGW}_xMins`] ?? 90)}{" "}
+            <span className="text-[7px] sm:text-[8px] font-bold text-slate-500 uppercase tracking-tight">
+              xMins
+            </span>
+          </span>
+          <span className="text-slate-400 font-light text-[10px]">|</span>
+          <span className="text-[10px] sm:text-xs font-black text-emerald-700">
+            £{getPlayerPrice(player).toFixed(1)}
+          </span>
+        </div>
+        <div
+          className="w-full bg-slate-900 border-x border-b border-slate-700 flex items-center rounded-b shadow-md h-[21px] px-0.5 overflow-hidden"
+        >
+          {/* THE FIX: Standard w-full with justify-center fixes the cutoff bug */}
+          <div className="flex items-center justify-center w-full whitespace-nowrap overflow-hidden text-ellipsis">
+            {renderFixtures(player.Team, activeGW)}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};

frontend/src/components/PlayerModals.jsx

@@ -0,0 +1,286 @@
+// src/components/PlayerModals.jsx
+import React,{ useState, useEffect, useContext } from "react";
+import { Search, Plus } from "lucide-react";
+import { getPlayerPrice } from "../utils/fplLogic";
+import { getShortName } from "../utils/teams";
+import { PlayerContext } from "../PlayerContext";
+
+const SafeMinsInput = ({ initialValue, onSave, isChild = false, disabled = false }) => {
+  const [val, setVal] = useState(initialValue);
+  useEffect(() => setVal(initialValue), [initialValue]);
+
+  return (
+    <input
+      type="number"
+      disabled={disabled}
+      value={val}
+      onChange={(e) => {
+        setVal(e.target.value);
+        onSave(e.target.value); 
+      }}
+      className={isChild 
+        ? "w-12 bg-slate-950 text-center font-mono text-xs font-bold text-indigo-400 rounded py-1 outline-none focus:ring-1 ring-indigo-500 border border-slate-800"
+        : `w-16 text-center font-mono text-sm font-bold rounded py-1 outline-none ${disabled ? 'bg-transparent text-slate-500' : 'bg-slate-900 text-emerald-400 focus:bg-slate-800 focus:ring-1 ring-emerald-500'}`
+      }
+    />
+  );
+};
+
+export const PlayerEditModal = ({
+  selectedPlayer,
+  setSelectedPlayer,
+  activeGW,
+  horizonGWs,
+  updatePlayerStat,
+  handleTransferOut,
+  fixtures,
+  fixtureOverrides, 
+  sessionEdits,
+  globalPlayers
+}) => {
+  
+  const { effectiveFixtures, globalXmins } = useContext(PlayerContext);
+  // THE FIX: Grab the live updating player, not the frozen snapshot!
+  const livePlayer = globalPlayers?.find(p => p.ID === selectedPlayer.ID) || selectedPlayer;
+
+  const TEAM_SHORTS = {
+    1: "ARS", 2: "AVL", 3: "BUR", 4: "BOU", 5: "BRE",
+    6: "BHA", 7: "CHE", 8: "CRY", 9: "EVE", 10: "FUL",
+    11: "LEE", 12: "LIV", 13: "MCI", 14: "MUN", 15: "NEW",
+    16: "NFO", 17: "SUN", 18: "TOT", 19: "WHU", 20: "WOL"
+  };
+
+  return (
+    <div className="fixed inset-0 z-[150] flex items-center justify-center bg-black/80 backdrop-blur-sm p-4">
+      <div className="bg-slate-950 border border-slate-800 w-full max-w-2xl rounded-2xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-200 flex flex-col">
+        <div className="bg-slate-900 p-5 flex justify-between items-center border-b border-slate-800">
+          <div className="flex flex-col">
+            <h3 className="font-black text-2xl text-slate-100 uppercase tracking-tight">{livePlayer.Name}</h3>
+            <div className="flex gap-3 text-sm font-bold text-slate-500">
+              <span>{livePlayer.Team}</span>
+              <span className="text-slate-700">|</span>
+              <span className="text-emerald-500">£{getPlayerPrice(livePlayer).toFixed(1)}m</span>
+            </div>
+          </div>
+          <button onClick={() => setSelectedPlayer(null)} className="text-slate-500 hover:text-white transition-colors bg-slate-900 p-2 rounded-full border border-slate-800">✕</button>
+        </div>
+        <div className="p-6 flex flex-col gap-6">
+          <div className="flex gap-4">
+            {[
+              { label: `GW${activeGW} xG`, val: livePlayer[`${activeGW}_xG`] ?? livePlayer.xG ?? "-" },
+              { label: `GW${activeGW} xA`, val: livePlayer[`${activeGW}_xA`] ?? livePlayer.xA ?? "-" },
+              { label: `GW${activeGW} CS%`, val: livePlayer[`${activeGW}_CS_Pct`] ?? livePlayer.CS_Pct ?? "-" },
+            ]
+            .filter(stat => !(stat.label.includes('CS%') && livePlayer.Pos === 'F'))
+            .map((stat) => (
+              <div key={stat.label} className="flex-1 bg-slate-900 p-3 rounded-xl border border-slate-800 flex flex-col items-center">
+                <span className="text-[10px] text-slate-500 font-bold uppercase tracking-widest text-center">{stat.label}</span>
+                <span className="text-lg font-mono font-bold text-slate-200">{typeof stat.val === "number" ? stat.val.toFixed(2) : stat.val}</span>
+              </div>
+            ))}
+          </div>
+
+          <div className="border border-slate-800 rounded-xl overflow-hidden">
+            <table className="w-full text-left text-sm">
+              <thead className="bg-slate-900 text-xs text-slate-500 uppercase font-bold">
+                <tr>
+                  <th className="p-3">GW</th>
+                  <th className="p-3 text-center">Fixture</th>
+                  <th className="p-3 text-center">xMins</th>
+                  <th className="p-3 text-right">Proj. EV</th>
+                </tr>
+              </thead>
+              <tbody className="divide-y divide-slate-800/50">
+                {horizonGWs.map((gw) => {
+                  const matches = [];
+                  if (livePlayer.match_projections) {
+                      Object.entries(livePlayer.match_projections).forEach(([mId, mData]) => {
+                          // THE FIX 2: Look at the merged globals instead of the empty prop!
+                          const override = effectiveFixtures?.[mId];
+                          
+                          // THE FIX 3: Force Number() to prevent API float bugs
+                          if (override && Number(override[gw]) > 0) matches.push({ ...mData, id: mId, prob: Number(override[gw]) });
+                          else if (!override && String(mData.default_gw) === String(gw)) matches.push({ ...mData, id: mId, prob: 1.0 });
+                      });
+                  }
+
+                  const hasMultiple = matches.length > 1; 
+                  const isBlank = matches.length === 0;
+
+                  return (
+                    <React.Fragment key={gw}>
+                      <tr className={`transition-colors ${hasMultiple ? 'bg-indigo-950/20' : 'bg-slate-950/50 hover:bg-slate-900'}`}>
+                        <td className="p-3 font-bold text-slate-400">GW{gw}</td>
+                        <td className="p-3 text-center text-xs font-bold text-slate-300">
+                          {isBlank ? (
+                            "BLANK"
+                          ) : hasMultiple ? (
+                            "MULTIPLE"
+                          ) : (
+                            <div className="flex items-center justify-center gap-1.5">
+                              <span>
+                                {matches[0]?.is_home ? `${TEAM_SHORTS[matches[0].opponent_team_id]} (H)` : `${TEAM_SHORTS[matches[0]?.opponent_team_id]} (A)`}
+                              </span>
+                              {matches[0]?.prob < 1.0 && (
+                                <span className="text-[9px] text-indigo-400 bg-indigo-500/20 px-1.5 py-0.5 rounded border border-indigo-500/30">
+                                  {Math.round(matches[0].prob * 100)}%
+                                </span>
+                              )}
+                            </div>
+                          )}
+                        </td>
+                        <td className="p-3">
+                          <div className="flex justify-center">
+                            <SafeMinsInput
+                              disabled={isBlank}
+                              initialValue={hasMultiple ? Math.round(livePlayer[`${gw}_xMins`] || 0) : (sessionEdits?.[livePlayer.ID]?.[`${gw}_xMins`] ?? Math.round(livePlayer[`${gw}_xMins`] || 0))}
+                              onSave={(newVal) => {
+                                if (hasMultiple) {
+                                  matches.forEach(m => updatePlayerStat(livePlayer.ID, m.id, "xMins", newVal));
+                                } else {
+                                  updatePlayerStat(livePlayer.ID, gw, "xMins", newVal);
+                                }
+                              }}
+                            />
+                          </div>
+                        </td>
+                        <td className="p-3 text-right font-mono font-bold text-cyan-400 drop-shadow-md">
+                          {Number(livePlayer[`${gw}_Pts`] || 0).toFixed(2)}
+                        </td>
+                      </tr>
+
+                      {hasMultiple && matches.map(m => {
+                        const oppName = TEAM_SHORTS[m.opponent_team_id] || m.opponent_team_id;
+                        const fixLabel = m.is_home ? `${oppName} (H)` : `${oppName} (A)`;
+                        const globalMatchMins = globalXmins?.[livePlayer.ID]?.[m.id];
+                        const sessionVal = sessionEdits?.[livePlayer.ID]?.[`${m.id}_xMins`];
+                        
+                        const currentMins = Math.round(sessionVal !== undefined ? Number(sessionVal) : (globalMatchMins !== undefined ? Number(globalMatchMins) : m.xMins));
+                        const scaledEV = (currentMins > 0 && m.xMins > 0) ? (m.Pts / m.xMins) * currentMins : 0;
+
+                        return (
+                          <tr key={m.id} className="bg-slate-900/40 border-t border-slate-800/30">
+                            <td className="p-2 text-right text-slate-600 font-black">↳</td>
+                            <td className="p-2 text-center text-[10px] font-bold text-indigo-300">
+                              {fixLabel} <span className="opacity-60">({Math.round(m.prob * 100)}%)</span>
+                            </td>
+                            <td className="p-2 flex justify-center">
+                              <SafeMinsInput 
+                                isChild={true}
+                                initialValue={currentMins}
+                                onSave={(newVal) => updatePlayerStat(livePlayer.ID, m.id, "xMins", newVal)}
+                              />
+                            </td>
+                            <td className="p-2 text-right text-[11px] font-mono font-bold text-indigo-400/80">
+                              {(scaledEV * m.prob).toFixed(2)}
+                            </td>
+                          </tr>
+                        );
+                      })}
+                    </React.Fragment>
+                  );
+                })}
+              </tbody>
+            </table>
+          </div>
+          <div className="flex gap-4 mt-2">
+            <button onClick={() => handleTransferOut(livePlayer)} className="flex-1 bg-red-950/40 border border-red-900/50 text-red-500 py-3 rounded-xl font-bold text-sm hover:bg-red-900/60 transition-colors">Transfer Out</button>
+            <button onClick={() => setSelectedPlayer(null)} className="flex-1 bg-luigi-500 hover:bg-luigi-400 text-slate-950 py-3 rounded-xl font-bold text-sm transition-colors shadow-lg">Apply Edits</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export const PlayerSearchModal = ({
+  selectedPlayer,
+  setSelectedPlayer,
+  searchQuery,
+  setSearchQuery,
+  sortConfig,
+  setSortConfig,
+  globalPlayers,
+  ownedPlayerIds,
+  activeGW,
+  itb,
+  handleAddPlayer,
+}) => {
+  return (
+    <div className="fixed inset-0 z-[150] flex items-center justify-center bg-black/80 backdrop-blur-sm p-4">
+      <div className="bg-slate-950 border border-slate-800 w-full max-w-lg rounded-2xl shadow-2xl overflow-hidden flex flex-col animate-in zoom-in-95 duration-200">
+        <div className="p-4 border-b border-slate-800 flex items-center gap-3">
+          <Search className="text-slate-500" size={20} />
+          <input
+            type="text"
+            placeholder="Search Database..."
+            value={searchQuery}
+            onChange={(e) => setSearchQuery(e.target.value)}
+            className="flex-1 bg-transparent border-none outline-none text-slate-200 font-bold"
+            autoFocus
+          />
+          <button onClick={() => setSelectedPlayer(null)} className="text-slate-500 hover:text-white font-bold text-sm">Cancel</button>
+        </div>
+
+        <div className="flex gap-2 p-2 px-4 border-b border-slate-800 bg-slate-900/50 items-center">
+          <span className="text-[10px] font-black text-slate-500 tracking-widest mr-2">SORT BY:</span>
+          <button
+            onClick={() => setSortConfig({ key: "ev", direction: sortConfig.key === "ev" && sortConfig.direction === "desc" ? "asc" : "desc" })}
+            className={`px-3 py-1 rounded text-xs font-bold transition-colors ${sortConfig.key === "ev" ? "bg-emerald-900/50 text-emerald-400" : "bg-slate-800 text-slate-400 hover:bg-slate-700"}`}
+          >
+            Proj. EV {sortConfig.key === "ev" ? (sortConfig.direction === "desc" ? "↓" : "↑") : ""}
+          </button>
+          <button
+            onClick={() => setSortConfig({ key: "price", direction: sortConfig.key === "price" && sortConfig.direction === "desc" ? "asc" : "desc" })}
+            className={`px-3 py-1 rounded text-xs font-bold transition-colors ${sortConfig.key === "price" ? "bg-emerald-900/50 text-emerald-400" : "bg-slate-800 text-slate-400 hover:bg-slate-700"}`}
+          >
+            Price {sortConfig.key === "price" ? (sortConfig.direction === "desc" ? "↓" : "↑") : ""}
+          </button>
+        </div>
+
+        <div className="max-h-[400px] overflow-y-auto p-2">
+          {globalPlayers
+            // THE FIX: Removed the restrictive 'replacedPlayer' ban and added defensive FPL ID type-checking
+            .filter((p) => !ownedPlayerIds.has(p.ID) && !ownedPlayerIds.has(String(p.ID)) && !ownedPlayerIds.has(Number(p.ID)) && String(p.ID) !== String(selectedPlayer.replacedPlayer?.ID) && p.Pos === selectedPlayer.Pos && p.Name.toLowerCase().includes(searchQuery.toLowerCase()))
+            .sort((a, b) => {
+              let valA = sortConfig.key === "ev" ? Number(a[`${activeGW}_Pts`] || 0) : getPlayerPrice(a);
+              let valB = sortConfig.key === "ev" ? Number(b[`${activeGW}_Pts`] || 0) : getPlayerPrice(b);
+              if (valA < valB) return sortConfig.direction === "desc" ? 1 : -1;
+              if (valA > valB) return sortConfig.direction === "desc" ? -1 : 1;
+              return 0;
+            })
+            .slice(0, 50)
+            .map((p) => {
+              // THE FIX: Your true FPL purchasing power includes the money freed up by selling the outgoing player
+              const sellingPrice = getPlayerPrice(selectedPlayer) || 0;
+              const maxBudget = itb + sellingPrice;
+              const cost = getPlayerPrice(p);
+              const isAffordable = cost <= maxBudget;
+
+              return (
+                <button
+                  key={p.ID}
+                  disabled={!isAffordable}
+                  onClick={() => handleAddPlayer(p)}
+                  className={`w-full flex items-center justify-between p-3 border-b border-slate-800/30 transition-colors group ${isAffordable ? "hover:bg-slate-900 cursor-pointer" : "opacity-40 cursor-not-allowed"}`}
+                >
+                  <div className="flex flex-col items-start text-left">
+                    <span className="font-bold text-slate-200 text-sm">{p.Name}</span>
+                    <span className="text-[10px] text-slate-500 font-bold uppercase tracking-wider">{p.Team} • {p.Pos}</span>
+                  </div>
+                  <div className="flex items-center gap-4 text-right">
+                    <div className="flex flex-col items-end">
+                      <span className="text-xs font-mono text-emerald-400 font-bold">EV: {Number(p[`${activeGW}_Pts`] || 0).toFixed(2)}</span>
+                      <span className="text-[10px] font-mono text-slate-400">{p[`${activeGW}_xMins`] || 0} xMins</span>
+                    </div>
+                    <span className={`text-sm font-mono font-bold ${isAffordable ? "text-slate-300" : "text-red-400"}`}>£{cost.toFixed(1)}m</span>
+                    <Plus className={`transition-colors ${isAffordable ? "text-slate-600 group-hover:text-luigi-400" : "text-slate-800"}`} size={18} />
+                  </div>
+                </button>
+              );
+            })}
+        </div>
+      </div>
+    </div>
+  );
+};

frontend/src/components/ProjectionsTable.jsx

@@ -0,0 +1,664 @@
+import React, { useState, useEffect, useMemo, useRef, useContext } from 'react';
+import { Search, ChevronLeft, ChevronRight, Shield, Download, RotateCcw, Loader2 } from 'lucide-react';
+import { getShortName } from '../utils/teams';
+import { PlayerContext } from '../PlayerContext';
+
+// --- BASELINE INPUT WITH LIVE AUTO-SAVE ---
+// --- BASELINE INPUT WITH LIVE AUTO-SAVE & SNAP-PROOF MEMORY ---
+const BaselineInput = ({ player, handleUpdate }) => {
+  const [val, setVal] = useState(player.baseline_xMins != null ? Math.round(player.baseline_xMins) : '');
+
+  useEffect(() => {
+    setVal(player.baseline_xMins != null ? Math.round(player.baseline_xMins) : '');
+  }, [player.baseline_xMins]);
+
+  return (
+    <input
+      type="number"
+      value={val}
+      onChange={(e) => setVal(e.target.value)}
+      onBlur={() => {
+         let num = val === '' ? 0 : parseInt(val, 10);
+         num = Math.max(0, Math.min(90, num)); // CAP FIX: Locks between 0 and 90
+         setVal(num);
+         handleUpdate(player.ID, 'baseline', null, num);
+      }}
+      onKeyDown={(e) => e.key === 'Enter' && e.target.blur()}
+      className="w-12 bg-transparent text-center font-mono text-sm font-bold text-emerald-400 focus:outline-none focus:bg-slate-950/80 focus:ring-1 ring-emerald-500 rounded py-1 hover:bg-slate-800/50 transition-colors cursor-text [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none"
+    />
+  );
+};
+
+// --- DGW CHILD INPUT WITH LIVE AUTO-SAVE ---
+const SafeChildInput = ({ initialValue, onSave }) => {
+  const [val, setVal] = useState(initialValue);
+  useEffect(() => setVal(initialValue), [initialValue]);
+  return (
+    <input 
+      type="number" 
+      value={val}
+      onChange={(e) => setVal(e.target.value)}
+      onBlur={() => {
+         let num = val === '' ? 0 : parseFloat(val);
+         num = Math.max(0, Math.min(90, num)); // CAP FIX
+         setVal(num);
+         onSave(num);
+      }}
+      onKeyDown={(e) => e.key === 'Enter' && e.target.blur()}
+      className="w-12 bg-slate-950 text-center font-mono text-xs font-bold text-indigo-400 rounded py-1 outline-none focus:ring-1 ring-indigo-500 border border-slate-800 [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none" 
+    />
+  );
+};
+
+// --- GW INPUT WITH LIVE AUTO-SAVE & DGW POPOVER ---
+// --- GW INPUT WITH SAFE FRONTEND SAVING ---
+// --- GW INPUT WITH SAFE FRONTEND SAVING ---
+const GwMinsInput = ({ player, gw, handleUpdate }) => {
+  const {effectiveFixtures, sessionEdits, globalXmins } = useContext(PlayerContext);
+  const [showPopover, setShowPopover] = useState(false);
+  const [isFocused, setIsFocused] = useState(false);
+  const popoverRef = useRef(null);
+  
+  const [val, setVal] = useState(player[`${gw}_xMins`] != null ? Math.round(player[`${gw}_xMins`]) : '');
+
+  useEffect(() => {
+    setVal(player[`${gw}_xMins`] != null ? Math.round(player[`${gw}_xMins`]) : '');
+  }, [player[`${gw}_xMins`]]);
+
+  useEffect(() => {
+    const handleClickOutside = (event) => {
+      if (popoverRef.current && !popoverRef.current.contains(event.target)) setShowPopover(false);
+    };
+    if (showPopover) document.addEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, [showPopover]);
+
+  const matches = [];
+  if (player.match_projections) {
+      Object.entries(player.match_projections).forEach(([mId, mData]) => {
+          const override = effectiveFixtures?.[mId];
+          // THE FIX: Force Number() conversion so strings like "1" don't break the math!
+          if (override && override[gw] > 0) matches.push({ ...mData, id: mId, prob: Number(override[gw]) });
+          else if (!override && String(mData.default_gw) === String(gw)) matches.push({ ...mData, id: mId, prob: 1.0 });
+      });
+  }
+  
+  const hasMultiple = matches.length > 1 || (matches.length === 1 && Math.abs(matches[0].prob - 1.0) > 0.001);
+  const isBlank = matches.length === 0;
+
+  const TEAM_SHORTS = {
+    1: "ARS", 2: "AVL", 3: "BUR", 4: "BOU", 5: "BRE",
+    6: "BHA", 7: "CHE", 8: "CRY", 9: "EVE", 10: "FUL",
+    11: "LEE", 12: "LIV", 13: "MCI", 14: "MUN", 15: "NEW",
+    16: "NFO", 17: "SUN", 18: "TOT", 19: "WHU", 20: "WOL"
+  };
+
+  if (isBlank) return <span className="text-[10px] font-bold text-slate-600">-</span>;
+  const hoverFixtureText = matches.map(m => `${TEAM_SHORTS[m.opponent_team_id] || m.opponent_team_id} ${m.is_home ? '(H)' : '(A)'}`).join(" & ");
+
+  const handleParentSave = (newVal) => {
+    let numVal = newVal === '' ? 0 : parseFloat(newVal);
+    numVal = Math.max(0, Math.min(90, numVal)); // CAP FIX
+    const currentAvg = Math.round(player[`${gw}_xMins`] || 0);
+    if (numVal === currentAvg) {
+        setVal(numVal);
+        return;
+    }
+    setVal(numVal); // Snaps the UI instantly
+
+    if (hasMultiple) {
+      const edits = {};
+      matches.forEach(m => { edits[m.id] = numVal; });
+      handleUpdate(player.ID, 'batch', edits, null);
+    } else {
+      handleUpdate(player.ID, 'single', gw, numVal);
+    }
+  };
+
+  return (
+    <div className="relative flex justify-center w-full pl-2" ref={popoverRef} title={hoverFixtureText}>
+      {isFocused && !hasMultiple && !isBlank && (
+         <div className="absolute bottom-full mb-1 left-1/2 -translate-x-1/2 bg-slate-800 text-indigo-300 text-[10px] font-bold px-2 py-0.5 rounded shadow-xl border border-indigo-500/30 whitespace-nowrap z-[100] pointer-events-none animate-in fade-in zoom-in-95">
+           {hoverFixtureText}
+         </div>
+      )}
+      <input
+        type="number"
+        title={hoverFixtureText}
+        value={val}
+        onClick={() => hasMultiple && setShowPopover(true)}
+        onFocus={() => !hasMultiple && setIsFocused(true)} 
+        onChange={(e) => !hasMultiple && setVal(e.target.value)}
+        onBlur={(e) => {
+            if (!hasMultiple) {
+                setIsFocused(false); // Hides tooltip when you click away
+                handleParentSave(e.target.value);
+            }
+        }}
+        onKeyDown={(e) => e.key === 'Enter' && e.target.blur()}
+        className={`w-12 bg-transparent text-center font-mono text-sm font-bold rounded py-1 outline-none transition-colors ${hasMultiple ? 'text-indigo-300 hover:bg-slate-800/50 cursor-pointer focus:ring-1 ring-indigo-500' : 'text-emerald-400 focus:bg-slate-950/80 focus:ring-1 ring-emerald-500 hover:bg-slate-800/50'} [&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none`}
+      />
+      
+      {showPopover && hasMultiple && (
+        <div className="absolute top-0 right-full mr-2 w-48 bg-slate-900 border border-indigo-500/50 rounded-lg shadow-2xl z-[200] flex flex-col overflow-hidden animate-in fade-in zoom-in-95">
+          <div className="bg-indigo-950/50 text-[9px] font-bold text-indigo-300 uppercase tracking-widest p-2 border-b border-indigo-500/30 flex justify-between items-center">
+            <span>Edit Match Splits</span>
+            <button onClick={(e) => { e.stopPropagation(); setShowPopover(false); }} className="text-indigo-400 hover:text-white text-xs">✕</button>
+          </div>
+          <div className="p-2 flex flex-col gap-2">
+            {matches.map(m => {
+              const oppName = TEAM_SHORTS[m.opponent_team_id] || m.opponent_team_id || "OPP";
+              const fixLabel = m.is_home ? `${oppName} (H)` : `${oppName} (A)`;
+              const globalMatchMins = globalXmins?.[player.ID]?.[m.id];
+              const sessionVal = sessionEdits?.[player.ID]?.[`${m.id}_xMins`];
+              const currentMins = Math.round(sessionVal !== undefined ? Number(sessionVal) : (globalMatchMins !== undefined ? Number(globalMatchMins) : m.xMins));
+              
+              return (
+                <div key={m.id} className="flex items-center justify-between gap-2">
+                  <span className="text-[10px] font-bold text-slate-300 truncate flex-1">{fixLabel} <span className="opacity-50">({Math.round(m.prob*100)}%)</span></span>
+                  <SafeChildInput 
+                    initialValue={currentMins}
+                    onSave={(newVal) => handleUpdate(player.ID, 'single', m.id, newVal)}
+                  />
+                </div>
+              );
+            })}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+export default function ProjectionsTable() {
+  const { 
+    globalPlayers: players, setGlobalPlayers, isLoadingDB, 
+    projSearchTerm: searchTerm, setProjSearchTerm: setSearchTerm, 
+    sessionEdits, setSessionEdits, manualOverrides, effectiveFixtures,setOriginalPlayers,globalXmins 
+  } = useContext(PlayerContext);
+  
+  const [sortConfig, setSortConfig] = useState({ key: 'Total Points', direction: 'desc' });
+  const [currentPage, setCurrentPage] = useState(1);
+  const itemsPerPage = 50;
+
+  const tableContainerRef = useRef(null);
+  useEffect(() => {
+    if (tableContainerRef.current) {
+      tableContainerRef.current.scrollTo({ top: 0, behavior: 'smooth' });
+    }
+  }, [currentPage]);
+
+  const [isAdmin, setIsAdmin] = useState(false);
+  const [adminPassword, setAdminPassword] = useState('');
+  const [showAdminLogin, setShowAdminLogin] = useState(false);
+  const [clickCount, setClickCount] = useState(0);
+  const clickTimeoutRef = useRef(null);
+
+  const handleSecretClick = () => {
+    setClickCount((prev) => {
+      const newCount = prev + 1;
+      if (newCount === 5) { setShowAdminLogin(!showAdminLogin); return 0; }
+      return newCount;
+    });
+    if (clickTimeoutRef.current) clearTimeout(clickTimeoutRef.current);
+    clickTimeoutRef.current = setTimeout(() => setClickCount(0), 1000);
+  };
+
+  const gameweeks = useMemo(() => {
+    if (!players || players.length === 0) return [];
+    const gwSet = new Set();
+    Object.keys(players[0]).forEach(k => {
+      if (/^\d+_Pts$/.test(k)) {
+        const num = parseInt(k.split('_')[0], 10);
+        if (num >= 1 && num <= 38) gwSet.add(num);
+      }
+    });
+    return Array.from(gwSet).sort((a, b) => a - b);
+  }, [players]);
+
+  const getDynamicTotal = (p) => gameweeks.reduce((sum, gw) => sum + (Number(p[`${gw}_Pts`]) || 0), 0);
+  const getDynamicAvg = (p) => gameweeks.length > 0 ? getDynamicTotal(p) / gameweeks.length : 0;
+
+  const handleUpdate = async (playerId, type, gw, valueStr) => {
+    const value = type === 'baseline' ? parseInt(valueStr, 10) || 0 : parseFloat(valueStr) || 0;
+    
+    // 1. Grab the active baseline from memory so Python doesn't forget it!
+    const activeBaseline = sessionEdits[playerId]?.baseline_xMins;
+
+    // 2. Prevent Python Crash: Separate Match IDs (13_vs_1) from real Gameweeks (34)
+    const realGwEdits = {};
+    if (type === 'batch') {
+        Object.keys(gw).forEach(k => { realGwEdits[k] = gw[k]; });
+    } else if (type === 'single') {
+        realGwEdits[gw] = value;
+    }
+
+    // 3. Update local React memory instantly (handles DGW splits perfectly)
+    setSessionEdits(prev => {
+        const next = { ...prev };
+        if (!next[playerId]) next[playerId] = {};
+        
+        if (type === 'baseline') {
+            next[playerId]['baseline_xMins'] = value;
+        } else if (type === 'batch') {
+            Object.keys(gw).forEach(k => { next[playerId][`${k}_xMins`] = gw[k]; });
+        } else {
+            next[playerId][`${gw}_xMins`] = value;
+        }
+
+        const token = localStorage.getItem('fpl_token');
+        if (token) {
+          fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+            method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+            body: JSON.stringify({ saved_edits: { ...next, _solver_overrides: manualOverrides } })
+          });
+        }
+        return next;
+    });
+
+    // 4. If this is a DGW match split ('13_vs_1'), STOP HERE. Don't crash Python!
+
+    try {
+      const payload = { player_id: playerId, is_admin: isAdmin, admin_password: adminPassword, gw_edits: realGwEdits };
+
+      // 5. Prevent Reset Bug: ALWAYS send the baseline to Python!
+      if (type === 'baseline') { 
+        payload.baseline_edit = value; 
+      } else if (activeBaseline !== undefined) {
+        payload.baseline_edit = activeBaseline; 
+      }
+
+      const res = await fetch('https://anayshukla-fpl-solver.hf.space/api/player/update', {
+        method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(payload)
+      });
+      if (!res.ok) { if (res.status === 401) { alert("Invalid Admin Password!"); setIsAdmin(false); } throw new Error('Backend recalculation failed'); }
+
+      const updatedRow = await res.json();
+
+      // 6. Merge Python's exact decayed math into the table
+      if (setGlobalPlayers) {
+         setGlobalPlayers(prev => prev.map(p => {
+           const newBaseline = type === 'baseline' ? (valueStr === '' ? null : value) : (activeBaseline !== undefined ? activeBaseline : p.baseline_xMins);
+           if (p.ID === playerId) return { ...p, ...updatedRow, baseline_xMins: newBaseline };
+           return p;
+         }));
+      }
+
+      // 7. Lock Python's curve into memory (from your old working file)
+      if (type === 'baseline') {
+         setSessionEdits(prev => {
+            const next = { ...prev };
+            gameweeks.forEach(g => {
+              next[playerId][`${g}_xMins`] = updatedRow[`${g}_xMins`];
+              next[playerId][`${g}_Pts`] = updatedRow[`${g}_Pts`];
+            });
+            return next;
+         });
+      }
+
+    } catch (err) { console.error("Recalculation error:", err); }
+  };
+
+  const resetPlayer = async (playerId) => {
+    try {
+      const res = await fetch('https://anayshukla-fpl-solver.hf.space/api/projections');
+      const freshData = await res.json();
+      const cleanPlayer = freshData.find(p => p.ID === playerId);
+      if (cleanPlayer && setGlobalPlayers) {
+         
+         // THE FLICKER FIX: Apply the UI math interceptor instantly before merging the reset player!
+         if (cleanPlayer.match_projections) {
+             gameweeks.forEach(g => {
+                 cleanPlayer[`${g}_Pts`] = 0;
+                 cleanPlayer[`${g}_xMins`] = 0;
+                 cleanPlayer[`${g}_probSum`] = 0;
+             });
+             Object.entries(cleanPlayer.match_projections).forEach(([mId, mData]) => {
+                 const pts = mData.Pts !== undefined ? mData.Pts : (mData.points || 0);
+                 const mins = mData.xMins !== undefined ? mData.xMins : (mData.mins || 0);
+                 const override = effectiveFixtures?.[mId];
+                 if (override) {
+                     Object.entries(override).forEach(([gwStr, prob]) => {
+                         if (prob > 0) {
+                             cleanPlayer[`${gwStr}_Pts`] = (cleanPlayer[`${gwStr}_Pts`] || 0) + (pts * prob);
+                             cleanPlayer[`${gwStr}_xMins`] = (cleanPlayer[`${gwStr}_xMins`] || 0) + (mins * prob);
+                             cleanPlayer[`${gwStr}_probSum`] = (cleanPlayer[`${gwStr}_probSum`] || 0) + prob;
+                         }
+                     });
+                 } else {
+                     const defGw = mData.default_gw;
+                     if (defGw) {
+                         cleanPlayer[`${defGw}_Pts`] = (cleanPlayer[`${defGw}_Pts`] || 0) + pts;
+                         cleanPlayer[`${defGw}_xMins`] = (cleanPlayer[`${defGw}_xMins`] || 0) + mins;
+                         cleanPlayer[`${defGw}_probSum`] = (cleanPlayer[`${defGw}_probSum`] || 0) + 1.0;
+                     }
+                 }
+             });
+             gameweeks.forEach(g => {
+                 if (cleanPlayer[`${g}_probSum`] > 0) {
+                     cleanPlayer[`${g}_xMins`] = cleanPlayer[`${g}_xMins`] / cleanPlayer[`${g}_probSum`];
+                 }
+             });
+         }
+
+         setGlobalPlayers(prev => prev.map(p => p.ID === playerId ? cleanPlayer : p));
+         if (setOriginalPlayers) {
+         setOriginalPlayers(prev => prev.map(p => p.ID === playerId ? cleanPlayer : p));
+        }
+         setSessionEdits(prev => {
+           const newEdits = { ...prev };
+           delete newEdits[playerId];
+           const token = localStorage.getItem('fpl_token');
+           if (token) {
+             fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+               method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+               body: JSON.stringify({ saved_edits: { ...newEdits, _solver_overrides: manualOverrides } })
+             });
+           }
+           return newEdits;
+         });
+      }
+    } catch (e) { console.error("Failed to reset player", e); }
+  };
+
+  const resetAll = async () => {
+    try {
+      const res = await fetch('https://anayshukla-fpl-solver.hf.space/api/projections');
+      const freshData = await res.json();
+      if (setGlobalPlayers) setGlobalPlayers(freshData);
+      setSessionEdits(prev => {
+          const token = localStorage.getItem('fpl_token');
+          if (token) {
+            fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+              method: 'POST', headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+              body: JSON.stringify({ saved_edits: { _solver_overrides: manualOverrides } })
+            });
+          }
+          return {};
+      });
+    } catch (e) { console.error("Failed to reset all", e); }
+  };
+
+  const downloadCSV = () => {
+    if (!players || players.length === 0) return;
+    const headers = ["Pos", "ID", "Name", "BV", "SV", "Team"];
+    gameweeks.forEach(gw => {
+      headers.push(`${gw}_xMins`, `${gw}_Pts`);
+    });
+    headers.push("Total Points", "Average Points");
+
+    let csvContent = "data:text/csv;charset=utf-8,";
+    csvContent += headers.join(",") + "\n";
+
+    const escapeCsv = (str) => {
+      if (str == null) return "";
+      const s = String(str);
+      return s.includes(",") ? `"${s}"` : s;
+    };
+
+    sortedAndFilteredData.forEach(p => {
+      const row = [
+        p.Pos,
+        p.ID,
+        escapeCsv(p.Name),
+        p.BV,
+        p.SV !== undefined ? p.SV : p.BV, 
+        escapeCsv(p.Team) 
+      ];
+      gameweeks.forEach(gw => {
+        const mins = Number(p[`${gw}_xMins`]) || 0;
+        const pts = Number(p[`${gw}_Pts`]) || 0;
+        row.push(Math.round(mins));
+        row.push(pts.toFixed(2));
+      });
+      row.push(getDynamicTotal(p).toFixed(2));
+      row.push(getDynamicAvg(p).toFixed(2));
+      csvContent += row.join(",") + "\n";
+    });
+
+    const encodedUri = encodeURI(csvContent);
+    const link = document.createElement("a");
+    link.setAttribute("href", encodedUri);
+    link.setAttribute("download", `luigis_mansion.csv`);
+    
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  };
+
+  const handleSort = (key) => {
+    let direction = 'desc';
+    if (sortConfig.key === key && sortConfig.direction === 'desc') direction = 'asc';
+    setSortConfig({ key, direction });
+  };
+
+  const sortedAndFilteredData = useMemo(() => {
+    if (!players) return [];
+    
+    // Add the special character normalizer
+    const cleanString = (str) => str ? str.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase() : "";
+    const cleanSearch = cleanString(searchTerm);
+
+    let filtered = searchTerm ? players.filter(p => cleanString(p.Name).includes(cleanSearch)) : [...players];
+    
+    return filtered.sort((a, b) => {
+      let valA = sortConfig.key === 'Total Points' ? getDynamicTotal(a) : (sortConfig.key === 'Average Points' ? getDynamicAvg(a) : a[sortConfig.key]);
+      let valB = sortConfig.key === 'Total Points' ? getDynamicTotal(b) : (sortConfig.key === 'Average Points' ? getDynamicAvg(b) : b[sortConfig.key]);
+      if (sortConfig.key === 'Team') { valA = getShortName(valA); valB = getShortName(valB); }
+      if (valA < valB) return sortConfig.direction === 'asc' ? -1 : 1;
+      if (valA > valB) return sortConfig.direction === 'asc' ? 1 : -1;
+      return 0;
+    });
+  }, [players, sortConfig, searchTerm, gameweeks]);
+
+  useEffect(() => setCurrentPage(1), [searchTerm, sortConfig]);
+
+  const totalPages = Math.ceil(sortedAndFilteredData.length / itemsPerPage);
+  const paginatedData = sortedAndFilteredData.slice((currentPage - 1) * itemsPerPage, currentPage * itemsPerPage);
+
+  const getMinsColor = (mins) => `rgba(52, 211, 153, ${Math.min(mins / 90, 1) * 0.4})`;
+  const getPtsColor = (pts) => pts <= 0 ? 'transparent' : `rgba(16, 185, 129, ${Math.min(pts / 10, 1) * 0.6})`;
+
+  if (isLoadingDB) return <div className="flex items-center justify-center h-64"><Loader2 size={32} className="animate-spin text-emerald-500" /></div>;
+
+  const displayedPlayers = useMemo(() => {
+    return paginatedData.map(p => {
+       if (!p.match_projections) return p;
+       const cloned = { ...p };
+       
+       gameweeks.forEach(g => {
+           cloned[`${g}_Pts`] = 0;
+           cloned[`${g}_xMins`] = 0;
+           cloned[`${g}_probSum`] = 0;
+       });
+
+       const manualBaseline = sessionEdits[p.ID]?.baseline_xMins;
+
+       Object.entries(p.match_projections).forEach(([mId, mData]) => {
+           const override = effectiveFixtures?.[mId];
+           
+           let manualMins = sessionEdits[p.ID]?.[`${mId}_xMins`];
+           const globalMatchMins = globalXmins?.[p.ID]?.[mId];
+           if (manualMins === undefined) {
+               if (globalMatchMins !== undefined) {
+                   manualMins = globalMatchMins;
+               } else {
+                   let activeGw = override ? Object.keys(override).find(g => override[g] > 0) : mData.default_gw;
+                   if (activeGw) manualMins = sessionEdits[p.ID]?.[`${activeGw}_xMins`] ?? globalXmins?.[p.ID]?.[activeGw];
+               }
+           }
+           
+           // Safely get the unedited minutes from the backend
+           const origMins = mData.xMins !== undefined ? mData.xMins : (mData.mins || 0);
+           let activeMins = origMins;
+
+           // THE DECAY FIX: Use a ratio to preserve the backend curve instead of flattening it
+           if (manualMins !== undefined) {
+               activeMins = Number(manualMins);
+           } else if (manualBaseline !== undefined) {
+               const origBase = p.baseline_xMins || 90;
+               const ratio = origBase > 0 ? (Number(manualBaseline) / origBase) : 1.0;
+               activeMins = Math.min((origMins * ratio), 90); 
+           }
+
+           const scaling = (activeMins > 0 && origMins > 0) ? (activeMins / origMins) : (activeMins === 0 ? 0 : 1);
+           const basePts = mData.Pts !== undefined ? mData.Pts : (mData.points || 0);
+           const aPts = basePts * scaling;
+
+           if (override) {
+               Object.entries(override).forEach(([gwStr, prob]) => {
+                   if (prob > 0) {
+                       cloned[`${gwStr}_Pts`] = (cloned[`${gwStr}_Pts`] || 0) + (aPts * prob);
+                       cloned[`${gwStr}_xMins`] = (cloned[`${gwStr}_xMins`] || 0) + (activeMins * prob);
+                       cloned[`${gwStr}_probSum`] = (cloned[`${gwStr}_probSum`] || 0) + prob;
+                   }
+               });
+           } else {
+               const defGw = mData.default_gw;
+               if (defGw) {
+                   cloned[`${defGw}_Pts`] = (cloned[`${defGw}_Pts`] || 0) + aPts;
+                   cloned[`${defGw}_xMins`] = (cloned[`${defGw}_xMins`] || 0) + activeMins;
+                   cloned[`${defGw}_probSum`] = (cloned[`${defGw}_probSum`] || 0) + 1.0;
+               }
+           }
+       });
+
+       gameweeks.forEach(g => {
+           if (cloned[`${g}_probSum`] > 0) {
+               cloned[`${g}_xMins`] = cloned[`${g}_xMins`] / cloned[`${g}_probSum`];
+           }
+       });
+
+       return cloned;
+    });
+  }, [paginatedData, sessionEdits, effectiveFixtures, gameweeks]);
+
+  return (
+    <div className="space-y-4 w-full">
+      <div className="flex flex-col md:flex-row justify-between items-center gap-4 bg-slate-900/40 p-4 rounded-xl border border-slate-800 backdrop-blur-sm shadow-sm">
+        <div className="flex gap-4 items-center">
+          <div className="relative w-72 flex items-center">
+            <div className="absolute left-0 w-10 h-full flex items-center justify-center cursor-pointer z-10" onClick={handleSecretClick}>
+              <Search className="text-slate-500 pointer-events-none" size={18} />
+            </div>
+            <input type="text" placeholder="Search players..." value={searchTerm} onChange={(e) => setSearchTerm(e.target.value)} className="w-full bg-slate-950/80 border border-slate-700 rounded-lg py-2 pl-10 pr-10 text-sm text-slate-200 focus:outline-none focus:border-luigi-400" />
+            {isAdmin && <Shield size={14} className="absolute right-3 text-luigi-500" title="Admin Mode Active" />}
+          </div>
+          {showAdminLogin && !isAdmin && (
+            <div className="flex gap-2 animate-in fade-in slide-in-from-left-4 duration-300">
+              <input type="password" placeholder="Admin Pass" value={adminPassword} onChange={(e) => setAdminPassword(e.target.value)} onKeyDown={(e) => e.key === 'Enter' && setIsAdmin(true)} className="bg-slate-950 border border-slate-700 rounded py-1.5 px-3 text-sm w-32 focus:outline-none focus:border-luigi-400 text-slate-200" />
+              <button onClick={() => setIsAdmin(true)} className="bg-slate-700 hover:bg-slate-600 px-3 rounded text-sm text-white transition-colors">Login</button>
+            </div>
+          )}
+        </div>
+        <div className="flex gap-3">
+          {Object.keys(sessionEdits).length > 0 && (
+            <button onClick={resetAll} className="flex items-center gap-2 px-3 py-2 text-sm bg-red-900/30 text-red-400 border border-red-900/50 rounded-lg hover:bg-red-900/50 transition-colors"><RotateCcw size={16} /> Reset to Default</button>
+          )}
+          <button onClick={downloadCSV} className="flex items-center gap-2 px-4 py-2 text-sm bg-luigi-500 text-slate-950 font-bold rounded-lg hover:bg-luigi-400 transition-colors shadow-lg shadow-luigi-500/20"><Download size={16} /> Export CSV</button>
+        </div>
+      </div>
+
+      <div ref={tableContainerRef} className="rounded-xl border border-slate-800 bg-slate-900/40 backdrop-blur-sm shadow-xl max-h-[70vh] overflow-y-auto overflow-x-auto [&::-webkit-scrollbar]:w-2 [&::-webkit-scrollbar]:h-2 [&::-webkit-scrollbar-track]:bg-transparent [&::-webkit-scrollbar-thumb]:bg-slate-700/50 [&::-webkit-scrollbar-thumb]:rounded-full hover:[&::-webkit-scrollbar-thumb]:bg-slate-600/80">
+        <table className="w-full text-sm text-left text-slate-300 relative">
+          <thead className="text-[11px] text-slate-400 uppercase bg-slate-950 border-b border-slate-800 sticky top-0 z-10 shadow-sm">
+            <tr>
+              <th onClick={() => handleSort('Pos')} className="px-3 py-4 cursor-pointer hover:text-slate-200 bg-slate-950 text-center whitespace-nowrap">Pos</th>
+              <th onClick={() => handleSort('Name')} className="px-3 py-4 cursor-pointer hover:text-slate-200 bg-slate-950 whitespace-nowrap">Name</th>
+              <th onClick={() => handleSort('Team')} className="px-3 py-4 cursor-pointer hover:text-slate-200 bg-slate-950 whitespace-nowrap">Team</th>
+              <th onClick={() => handleSort('BV')} className="px-3 py-4 cursor-pointer hover:text-slate-200 bg-slate-950 text-center whitespace-nowrap">Cost</th>
+              <th onClick={() => handleSort('baseline_xMins')} className="px-2 py-3 text-center border-l border-slate-800/50 bg-slate-900/50 cursor-pointer">
+                <div className="flex flex-col items-center gap-1"><span className="text-emerald-400 font-bold tracking-wider">Baseline</span><div className="flex w-full text-[10px] text-slate-500 justify-center px-1">xMins</div></div>
+              </th>
+              {gameweeks.map(gw => (
+                <th key={gw} className="px-2 py-3 text-center border-l border-slate-800/50 bg-slate-950">
+                  <div className="flex flex-col items-center gap-1">
+                    <span className="text-luigi-400 font-bold tracking-wider">GW{gw}</span>
+                    <div className="flex w-full text-[10px] text-slate-500 justify-around px-1 gap-2">
+                      <span className="cursor-pointer hover:text-slate-300" onClick={() => handleSort(`${gw}_xMins`)}>xMins</span>
+                      <span className="cursor-pointer hover:text-slate-300" onClick={() => handleSort(`${gw}_Pts`)}>xPts</span>
+                    </div>
+                  </div>
+                </th>
+              ))}
+              <th onClick={() => handleSort('Total Points')} className="px-3 py-4 text-right cursor-pointer hover:text-slate-200 text-luigi-400 border-l border-slate-800/50 bg-slate-950 whitespace-nowrap">Total</th>
+              <th className="px-3 py-4 text-center bg-slate-950 border-l border-slate-800/50 whitespace-nowrap">Reset</th>
+            </tr>
+          </thead>
+          
+          <tbody className="divide-y divide-slate-800/50">
+            {displayedPlayers.map((player) => (
+              <tr key={player.ID} className={`transition-colors group ${sessionEdits[player.ID] ? 'bg-luigi-900/10' : 'hover:bg-slate-800/30'}`}>
+                <td className="px-3 py-2 font-medium text-slate-500 text-center whitespace-nowrap">{player.Pos}</td>
+                <td className="px-3 py-2 font-bold text-slate-100 truncate max-w-[160px]">{player.Name}</td>
+                <td className="px-3 py-2 text-slate-400 font-bold text-center">{getShortName(player.Team)}</td>
+                <td className="px-3 py-2 text-center whitespace-nowrap">{player.BV}</td>
+                
+                <td className="p-0 border-l border-slate-800/30 bg-slate-900/30">
+                  <div className="w-full h-full p-1.5 flex items-center justify-center">
+                    <BaselineInput 
+                      player={player} 
+                      handleUpdate={handleUpdate} 
+                    />
+                  </div>
+                </td>
+
+                {gameweeks.map(gw => (
+                  <td key={gw} className="p-0 border-l border-slate-800/30">
+                    <div className="flex h-full items-stretch">
+                      <div className="relative w-1/2 p-2 border-r border-slate-800/20 flex items-center justify-center" style={{ backgroundColor: getMinsColor(player[`${gw}_xMins`]) }}>
+                        <GwMinsInput 
+                          player={player} 
+                          gw={gw}
+                          handleUpdate={handleUpdate} 
+                        />
+                        
+                        {/* TAG FIX: Tiny, padded, and pointer-events-none so it never blocks clicks */}
+                        {player[`${gw}_probSum`] > 1.01 && (
+                          <span className="absolute top-0 right-0 text-[7px] leading-none py-[2px] px-1 bg-indigo-500/90 text-white rounded-bl font-black tracking-tighter pointer-events-none" title={`DGW`}>
+                            DGW
+                          </span>
+                        )}
+                        {player[`${gw}_probSum`] < 0.99 && player[`${gw}_probSum`] > 0.01 && (
+                          <span className="absolute top-0 right-0 text-[7px] leading-none py-[2px] px-1 bg-orange-500/90 text-white rounded-bl font-black pointer-events-none" title="Odds of the fixture happening">
+                            %
+                          </span>
+                        )}  
+                      </div>
+                      <div className="w-1/2 p-2 text-center font-mono text-sm font-bold flex items-center justify-center" style={{ backgroundColor: getPtsColor(player[`${gw}_Pts`]) }}>
+                        <span className="drop-shadow-md">{Number(player[`${gw}_Pts`]).toFixed(2)}</span>
+                      </div>
+                    </div>
+                  </td>
+                ))}
+                
+                <td className="px-3 py-2 text-right font-bold text-luigi-400 font-mono border-l border-slate-800/30 bg-slate-900/20 group-hover:bg-transparent">{getDynamicTotal(player).toFixed(2)}</td>
+                <td className="px-2 py-2 text-center border-l border-slate-800/30">
+                  {sessionEdits[player.ID] && (
+                    <button onClick={() => resetPlayer(player.ID)} className="p-1 text-slate-500 hover:text-red-400 transition-colors" title="Reset Player">
+                      <RotateCcw size={16} />
+                    </button>
+                  )}
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      </div>
+      {totalPages > 1 && (
+        <div className="flex items-center justify-between px-4 py-3 bg-slate-900/40 border border-slate-800 rounded-xl mt-2">
+          <span className="text-sm text-slate-400">
+            Showing <span className="font-bold text-slate-200">{(currentPage - 1) * itemsPerPage + 1}</span> to <span className="font-bold text-slate-200">{Math.min(currentPage * itemsPerPage, sortedAndFilteredData.length)}</span> of <span className="font-bold text-slate-200">{sortedAndFilteredData.length}</span> players
+          </span>
+          <div className="flex gap-2">
+            <button onClick={() => setCurrentPage(p => Math.max(1, p - 1))} disabled={currentPage === 1} className="p-1.5 rounded-lg bg-slate-800 text-slate-300 hover:bg-slate-700 disabled:opacity-50 transition-colors">
+              <ChevronLeft size={20} />
+            </button>
+            <button onClick={() => setCurrentPage(p => Math.min(totalPages, p + 1))} disabled={currentPage === totalPages} className="p-1.5 rounded-lg bg-slate-800 text-slate-300 hover:bg-slate-700 disabled:opacity-50 transition-colors">
+              <ChevronRight size={20} />
+            </button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/Solver.jsx

@@ -0,0 +1,1806 @@
+import React, { useState, useEffect, useMemo, useContext, useRef } from "react";
+import { createPortal } from "react-dom";
+import { Search, Loader2, RotateCcw, Shield, Settings, Zap, Plus, Copy, Trash2 } from "lucide-react";
+import { DndContext, DragOverlay, closestCenter, PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
+import { PlayerContext } from "../PlayerContext";
+import { CHIP_CONFIG, getPlayerPrice, normalizeBenchGkFirst } from "../utils/fplLogic";
+import { useFplSolverApi } from "../hooks/useFplSolverApi";
+import { SolverOutputPanel } from "./SolverOutputPanel";
+import { PitchView } from "./PitchView";
+import { PlayerEditModal, PlayerSearchModal } from "./PlayerModals";
+import { PlayerCardVisual } from "./PlayerCardVisual";
+import { TabsPanel } from "./TabsPanel";
+import { AdvancedSettingsModal, DEFAULT_SETTINGS } from "./AdvancedSettingsModal";
+import { ActiveMovesPanel } from "./ActiveMovesPanel";
+import { DraftsComparisonTable } from "./DraftsComparisonTable";
+
+export default function Solver() {
+  const {
+    globalPlayers, updatePlayerStat, isLoadingDB, teamId, setTeamId, teamData, setTeamData, availableGWs, setAvailableGWs, horizon, setHorizon, activeGW, setActiveGW, captainId, setCaptainId, viceId, setViceId, initialSquadIds, setInitialSquadIds, isLoggedIn, userProfile, setUserProfile, manualOverrides, setManualOverrides, highlightTransferIds, setHighlightTransferIds, transfersByGw, setTransfersByGw, chipsByGw, setChipsByGw, baselineItb, setBaselineItb, baselineFt, setBaselineFt, availableFts, setAvailableFts, itb, setItb, HIT_COST, ftAtStartOfGw, quickSettings, setQuickSettings, advancedSettings, setAdvancedSettings, numSims, setNumSims, comprehensiveSettings, setComprehensiveSettings, appliedPlanSummary, setAppliedPlanSummary, solverApplySnapshot, setSolverApplySnapshot, solverTransferPairs, setSolverTransferPairs, solveElapsedSec, setSolveElapsedSec, drafts, setDrafts, activeDraftId, setActiveDraftId, fixtureOverrides, sessionEdits
+  } = useContext(PlayerContext);
+
+  // --- THE PRISTINE VAULT ---
+  const pristineSquadRef = useRef({});
+
+  const [pendingAutoReset, setPendingAutoReset] = useState(false);
+  const lastOverridesRef = useRef(fixtureOverrides);
+
+  // Watches for fixture changes and queues an auto-reset for when the math finishes
+  useEffect(() => {
+    if (lastOverridesRef.current !== fixtureOverrides) {
+      lastOverridesRef.current = fixtureOverrides;
+      setPendingAutoReset(true);
+    }
+  }, [fixtureOverrides]);
+
+  // --- STRICT VAULT-BASED PLAYER FACTORY ---
+  const hydratePlayer = (id, knownPristineData = null) => {
+    const globalMatch = globalPlayers.find((p) => String(p.ID) === String(id));
+    if (!globalMatch) return null;
+
+    // 1. Trust explicit overrides (like when clicking 'undo transfer')
+    if (knownPristineData && typeof knownPristineData === "object" && knownPristineData.purchase_price !== undefined) {
+      const hydrated = { ...globalMatch, ...knownPristineData };
+      hydrated.now_cost = globalMatch.now_cost !== undefined ? globalMatch.now_cost : globalMatch.Price;
+      for (const key in globalMatch) { if (key.includes("_Pts")) hydrated[key] = globalMatch[key]; }
+      hydrated.Price = hydrated.selling_price !== undefined ? hydrated.selling_price : getPlayerPrice(hydrated);
+      return hydrated;
+    }
+
+    const marketCost = globalMatch.now_cost !== undefined ? globalMatch.now_cost : globalMatch.Price;
+    const lockedBaselinePlayer = pristineSquadRef.current[id];
+
+    // 2. CHECK THE CHAIN: Was this player sold in any previous gameweek?
+    let isChainBroken = false;
+
+    if (lockedBaselinePlayer && availableGWs && availableGWs.length > 0) {
+      const pastGWs = availableGWs.filter(g => g < activeGW).sort((a, b) => a - b);
+
+      for (const gw of pastGWs) {
+        if (chipsByGw[gw] === "fh") continue; // FH sells do not break the permanent chain
+
+        // Check human moves
+        const mLock = manualOverrides[gw];
+        if (mLock?.manualTransfers && Object.values(mLock.manualTransfers).some(p => String(p?.ID) === String(id))) {
+          isChainBroken = true; break;
+        }
+
+        // Check solver moves
+        const sPairs = solverTransferPairs[gw];
+        if (sPairs && Object.values(sPairs).some(pair => String(pair.outPlayer?.ID) === String(id))) {
+          isChainBroken = true; break;
+        }
+      }
+    } else {
+      // If they aren't in the vault, they were bought after GW1. The chain is inherently broken.
+      isChainBroken = true;
+    }
+
+    // 3. APPLY THE LOGIC
+    let finalPurchasePrice, finalSellingPrice;
+
+    if (lockedBaselinePlayer && !isChainBroken) {
+      // Chain unbroken: They are a GW1 original. Use the locked vault prices.
+      finalPurchasePrice = lockedBaselinePlayer.purchase_price;
+      finalSellingPrice = lockedBaselinePlayer.selling_price !== undefined ? lockedBaselinePlayer.selling_price : getPlayerPrice(lockedBaselinePlayer);
+    } else {
+      // Chain broken: They were bought later, or sold and repurchased. Price resets to market cost.
+      finalPurchasePrice = marketCost;
+      finalSellingPrice = marketCost;
+    }
+
+    const hydrated = {
+      ...globalMatch,
+      ...(lockedBaselinePlayer && !isChainBroken ? lockedBaselinePlayer : {}),
+      purchase_price: finalPurchasePrice,
+      selling_price: finalSellingPrice,
+      Price: finalSellingPrice, // Lock the display value
+      now_cost: marketCost
+    };
+
+    // Overlay freshest points
+    for (const key in globalMatch) {
+      if (key.includes("_Pts")) hydrated[key] = globalMatch[key];
+    }
+
+    return hydrated;
+  };
+
+  const [isLoading, setIsLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [fixtures, setFixtures] = useState([]);
+  const [activeDragPlayer, setActiveDragPlayer] = useState(null);
+  const [selectedPlayer, setSelectedPlayer] = useState(null);
+  const [searchQuery, setSearchQuery] = useState("");
+  const [sortConfig, setSortConfig] = useState({ key: "ev", direction: "desc" });
+  const [showIdPrompt, setShowIdPrompt] = useState(false);
+  // --- DEFAULT ID ONBOARDING STATE ---
+  const [showInitialIdPrompt, setShowInitialIdPrompt] = useState(false);
+  const [initialIdInput, setInitialIdInput] = useState("");
+
+  // Trigger popup if logged in but no default ID is set
+  useEffect(() => {
+    if (isLoggedIn && userProfile && !userProfile.defaultTeamId) {
+      setShowInitialIdPrompt(true);
+    } else {
+      setShowInitialIdPrompt(false);
+    }
+  }, [isLoggedIn, userProfile]);
+
+  const handleSaveInitialId = () => {
+    const parsedId = parseInt(initialIdInput);
+    if (!parsedId) return;
+
+    const token = localStorage.getItem('fpl_token');
+    if (token) {
+      fetch('https://anayshukla-fpl-solver.hf.space/api/auth/save_session', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` },
+        body: JSON.stringify({ default_team_id: parsedId })
+      });
+      setUserProfile(prev => ({ ...prev, defaultTeamId: parsedId }));
+      setTeamId(String(parsedId)); // Auto-load the ID for them
+      setShowInitialIdPrompt(false);
+    }
+  };
+  const [pendingTeamId, setPendingTeamId] = useState(null);
+  const [lastLoadedId, setLastLoadedId] = useState(teamData.length > 0 ? teamId : null);
+
+  const [solverTab, setSolverTab] = useState("solver");
+  const [showAdvancedSettings, setShowAdvancedSettings] = useState(false);
+  const [banSearch, setBanSearch] = useState("");
+  const [lockSearch, setLockSearch] = useState("");
+  const [chipSolveOptions, setChipSolveOptions] = useState({ wc: [], fh: [], bb: [], tc: [] });
+  const [showDraftMenu, setShowDraftMenu] = useState(false);
+
+  const [sensTimer, setSensTimer] = useState(0);
+  const [chipSolveTimer, setChipSolveTimer] = useState(0);
+
+  const abortControllerRef = useRef(null);
+  const sensors = useSensors(useSensor(PointerSensor, { activationConstraint: { distance: 5 } }));
+
+  const {
+    isSolving, isChipSolving, isRunningSens, pendingSolutions, setPendingSolutions, chipSolveSolutions, setChipSolveSolutions, sensResults, setSensResults, sensViewGw, setSensViewGw, handleSolve: apiHandleSolve, handleChipSolve: apiHandleChipSolve, handleSensAnalysis: apiHandleSensAnalysis, loadSettingsFromCloud, saveSettingsToCloud
+  } = useFplSolverApi(abortControllerRef);
+
+  useEffect(() => {
+    let interval;
+    if (isRunningSens) { interval = setInterval(() => setSensTimer((t) => t + 1), 1000); } else { setSensTimer(0); }
+    return () => clearInterval(interval);
+  }, [isRunningSens]);
+
+  useEffect(() => {
+    let interval;
+    if (isChipSolving) { interval = setInterval(() => setChipSolveTimer((t) => t + 1), 1000); } else { setChipSolveTimer(0); }
+    return () => clearInterval(interval);
+  }, [isChipSolving]);
+
+  const maxAvailableHorizon = useMemo(() => (availableGWs.length ? Math.min(10, availableGWs.length) : 10), [availableGWs]);
+  const horizonGWs = useMemo(() => (availableGWs.length ? availableGWs.slice(0, horizon) : []), [availableGWs, horizon]);
+  const playerCardGWs = useMemo(() => {
+    if (!horizonGWs.length || !activeGW) return [];
+    const idx = horizonGWs.indexOf(activeGW);
+    return idx === -1 ? [] : horizonGWs.slice(idx).slice(0, 3);
+  }, [horizonGWs, activeGW]);
+  const solveGWs = useMemo(() => {
+    if (!horizonGWs.length || !activeGW) return horizonGWs;
+    const idx = horizonGWs.indexOf(activeGW);
+    return idx === -1 ? horizonGWs : horizonGWs.slice(idx);
+  }, [horizonGWs, activeGW]);
+
+  const solveGWLabel = useMemo(() => {
+    if (!solveGWs.length) return "";
+    return solveGWs.length === 1 ? `GW${solveGWs[0]}` : `GW${solveGWs[0]}–${solveGWs[solveGWs.length - 1]}`;
+  }, [solveGWs]);
+
+  const ownedPlayerIds = useMemo(() => new Set(teamData.filter((p) => !p.isBlank).map((p) => p.ID)), [teamData]);
+
+  const hitsThisGw = useMemo(() => {
+    const T = transfersByGw[activeGW]?.count || 0;
+    const chip = chipsByGw[activeGW];
+    if (chip === "wc" || chip === "fh") return 0;
+    const startFt = ftAtStartOfGw(activeGW, availableGWs, baselineFt, transfersByGw, chipsByGw);
+    return Math.max(0, T - startFt);
+  }, [activeGW, availableGWs, baselineFt, transfersByGw, chipsByGw]);
+
+  // 1. Standard state (can default to your hardcoded defaults initially)
+  const [isCloudLoaded, setIsCloudLoaded] = useState(false);
+
+  // 1. Fetch from Cloud on Mount / Login
+  useEffect(() => {
+    if (teamId && !isCloudLoaded) {
+      loadSettingsFromCloud(teamId).then((cloudData) => {
+        if (cloudData) {
+          if (cloudData.quick) {
+            setQuickSettings(prev => ({ ...prev, ...cloudData.quick }));
+          }
+          // THE FIX: Use setComprehensiveSettings!
+          if (cloudData.advanced) {
+            setComprehensiveSettings(prev => ({ ...prev, ...cloudData.advanced }));
+          }
+        }
+        setIsCloudLoaded(true);
+      });
+    }
+  }, [teamId]);
+
+  // 2. Save to Cloud (DEBOUNCED)
+  useEffect(() => {
+    if (teamId && isCloudLoaded) {
+      const timerId = setTimeout(() => {
+        // THE FIX: Pass comprehensiveSettings instead of advancedSettings!
+        saveSettingsToCloud(teamId, quickSettings, comprehensiveSettings);
+      }, 500);
+      return () => clearTimeout(timerId);
+    }
+    // THE FIX: Watch comprehensiveSettings in the dependency array!
+  }, [quickSettings, comprehensiveSettings, teamId, isCloudLoaded]);
+
+  const getValidLayout = (players, gw) => {
+    if (!players || players.length !== 15) return null;
+    const getEV = (p) => p.isBlank ? -1000 : (Number(p[`${gw}_Pts`]) || 0);
+
+    let gks = players.filter((p) => p.Pos === "G").sort((a, b) => getEV(b) - getEV(a));
+    let defs = players.filter((p) => p.Pos === "D").sort((a, b) => getEV(b) - getEV(a));
+    let mids = players.filter((p) => p.Pos === "M").sort((a, b) => getEV(b) - getEV(a));
+    let fwds = players.filter((p) => p.Pos === "F").sort((a, b) => getEV(b) - getEV(a));
+
+    const starters = [];
+    if (gks.length) starters.push(gks.shift());
+    starters.push(...defs.splice(0, 3), ...mids.splice(0, 2), ...fwds.splice(0, 1));
+
+    const remaining = [...defs, ...mids, ...fwds].sort((a, b) => getEV(b) - getEV(a));
+    starters.push(...remaining.splice(0, 11 - starters.length));
+
+    const finalStarters = [
+      ...starters.filter((p) => p.Pos === "G"),
+      ...starters.filter((p) => p.Pos === "D"),
+      ...starters.filter((p) => p.Pos === "M"),
+      ...starters.filter((p) => p.Pos === "F"),
+    ];
+
+    const benchGk = gks.length ? gks[0] : null;
+    const benchRest = remaining.sort((a, b) => getEV(b) - getEV(a));
+    const bench = benchGk ? [benchGk, ...benchRest] : benchRest;
+    const topStarters = [...finalStarters].sort((a, b) => getEV(b) - getEV(a));
+
+    return { optimalArray: [...finalStarters, ...bench], cap: topStarters[0]?.ID, vice: topStarters[1]?.ID };
+  };
+
+  const derivedItb = useMemo(() => {
+    let currentBank = baselineItb;
+    if (!availableGWs || availableGWs.length === 0) return currentBank;
+    for (let gw = availableGWs[0]; gw <= activeGW; gw++) {
+      if (gw < activeGW && chipsByGw[gw] === "fh") continue;
+      if (transfersByGw[gw]) currentBank += transfersByGw[gw].netDelta || 0;
+    }
+    return currentBank;
+  }, [activeGW, availableGWs, baselineItb, transfersByGw, chipsByGw]);
+
+  const currentRemainingFts = useMemo(() => {
+    if (!availableGWs || availableGWs.length === 0) return baselineFt;
+    const startingFts = ftAtStartOfGw(activeGW, availableGWs, baselineFt, transfersByGw, chipsByGw);
+    const usedThisWeek = transfersByGw[activeGW]?.count || 0;
+    return Math.max(0, startingFts - usedThisWeek);
+  }, [activeGW, availableGWs, baselineFt, transfersByGw, chipsByGw, ftAtStartOfGw]);
+
+  useEffect(() => {
+    fetch("https://anayshukla-fpl-solver.hf.space/api/fixtures").then((res) => res.json()).then(setFixtures).catch(() => { });
+    fetch("https://anayshukla-fpl-solver.hf.space/api/solver/default-settings").then((r) => (r.ok ? r.json() : {})).then((d) => {
+      if (d && typeof d === "object") {
+        setComprehensiveSettings(prev => ({ ...d, ...prev }));
+      }
+    }).catch(() => { });
+  }, []);
+
+  useEffect(() => { setItb(derivedItb); setAvailableFts(currentRemainingFts); }, [derivedItb, currentRemainingFts, setItb, setAvailableFts]);
+  useEffect(() => { if (horizon > maxAvailableHorizon && maxAvailableHorizon > 0) setHorizon(maxAvailableHorizon); }, [maxAvailableHorizon, horizon]);
+
+  useEffect(() => {
+    if (!isSolving) { setSolveElapsedSec(0); return; }
+    const t0 = Date.now();
+    const id = setInterval(() => setSolveElapsedSec(Math.floor((Date.now() - t0) / 1000)), 250);
+    const prev = document.body.style.overflow;
+    document.body.style.overflow = "hidden";
+    return () => { clearInterval(id); document.body.style.overflow = prev; };
+  }, [isSolving]);
+
+  useEffect(() => {
+    if (isLoggedIn && userProfile.defaultTeamId && String(userProfile.defaultTeamId) === String(teamId) && availableGWs.length === 0 && !isLoading) {
+      fetchTeam(null, teamData.length > 0);
+    }
+  }, [isLoggedIn, userProfile.defaultTeamId, teamId, availableGWs.length, teamData.length]);
+
+  const fetchTeam = async (e, preserveState = false) => {
+    // If manually clicked by user, always wipe the slate clean
+    if (e) { e.preventDefault(); setManualOverrides({}); preserveState = false; }
+
+    if (!teamId) return;
+    setIsLoading(true); setError(null);
+    try {
+      const res = await fetch(`https://anayshukla-fpl-solver.hf.space/api/manager/${teamId}`);
+      if (!res.ok) throw new Error("Could not fetch team.");
+      const data = await res.json();
+
+      if (data.picks && data.picks.length > 0) {
+        // 1. ALWAYS populate the strict baseline vault and logic
+        pristineSquadRef.current = {};
+        data.picks.forEach(p => {
+          pristineSquadRef.current[p.ID] = { ...p };
+        });
+        setBaselineItb(data.in_the_bank || 0);
+        setBaselineFt(typeof data.free_transfers === "number" ? data.free_transfers : 1);
+        setInitialSquadIds(data.picks.map((p) => p.ID));
+
+        const gws = Object.keys(data.picks[0]).filter((k) => k.includes("_Pts")).map((k) => parseInt(k.split("_")[0])).sort((a, b) => a - b);
+        setAvailableGWs(gws);
+
+        // 2. ONLY overwrite the squad arrays if we are NOT loading from a saved DB Draft
+        if (!preserveState) {
+          setTransfersByGw({}); setHighlightTransferIds({}); setSolverTransferPairs({}); setSolverApplySnapshot(null); setChipsByGw({}); setChipSolveSolutions([]);
+          setActiveGW(gws[0]);
+          const opt = getValidLayout(data.picks, gws[0]);
+          if (opt) { setTeamData(opt.optimalArray); setCaptainId(opt.cap); setViceId(opt.vice); }
+          else { setTeamData(data.picks); }
+        } else {
+          // If preserving state, just ensure activeGW doesn't break if the draft lacked it
+          if (!activeGW) setActiveGW(gws[0]);
+        }
+
+        setLastLoadedId(teamId);
+        if (isLoggedIn && userProfile.defaultTeamId !== parseInt(teamId)) { setPendingTeamId(parseInt(teamId)); setShowIdPrompt(true); }
+      }
+    } catch (err) { setError(err.message); } finally { setIsLoading(false); }
+  };
+
+  useEffect(() => {
+    if (!teamData.length || !activeGW || teamData.some((p) => p.isBlank && !String(p.ID).startsWith("blank_"))) return;
+
+    const gwLock = manualOverrides[activeGW];
+
+    if (gwLock && gwLock.ids) {
+      let reconstructed = gwLock.ids.map((id) => {
+        if (String(id).startsWith("blank_")) {
+          const replaced = gwLock.manualTransfers?.[id];
+          return { ID: id, isBlank: true, Pos: replaced?.Pos || "M", Name: "", Team: "", Price: 0, replacedPlayer: replaced };
+        }
+
+        let found = hydratePlayer(id);
+        if (found && gwLock.manualTransfers && gwLock.manualTransfers[id]) {
+          found.replacedPlayer = gwLock.manualTransfers[id];
+        }
+        return found;
+      }).filter(Boolean);
+
+      if (reconstructed.length !== 15) {
+        if (globalPlayers.length > 0) {
+          setManualOverrides((prev) => { const n = { ...prev }; delete n[activeGW]; return n; });
+        }
+        return;
+      }
+
+      // THE FIX: Auto-optimize lineup safely AFTER global EVs finish recalculating!
+      if (pendingAutoReset) {
+        const opt = getValidLayout(reconstructed, activeGW);
+        if (opt) {
+          setManualOverrides((prev) => ({ ...prev, [activeGW]: { ...gwLock, ids: opt.optimalArray.map((p) => p.ID), cap: opt.cap, vice: opt.vice } }));
+          setTeamData(opt.optimalArray);
+          setCaptainId(opt.cap);
+          setViceId(opt.vice);
+        }
+        setPendingAutoReset(false);
+        return;
+      }
+
+      let needsSub = false;
+      const getEV = (p) => Number(p[`${activeGW}_Pts`]) || 0;
+
+      for (let i = 0; i < 11; i++) {
+        const starter = reconstructed[i];
+        if (starter.isBlank || (getEV(starter) === 0 && (!gwLock.forcedZeros || !gwLock.forcedZeros.includes(starter.ID)))) {
+          const bestBenchIdx = [11, 12, 13, 14].find((bIdx) => {
+            const bPlayer = reconstructed[bIdx];
+            if (bPlayer.isBlank || getEV(bPlayer) <= 0) return false;
+
+            const tempStarters = [...reconstructed.slice(0, 11)];
+            tempStarters[i] = bPlayer;
+            const counts = { G: 0, D: 0, M: 0, F: 0 };
+            tempStarters.forEach(p => { if (p.Pos) counts[p.Pos]++; });
+
+            if (counts.G !== 1 || counts.D < 3 || counts.M < 2 || counts.F < 1) return false;
+            return true;
+          });
+
+          if (bestBenchIdx) {
+            const temp = reconstructed[i];
+            reconstructed[i] = reconstructed[bestBenchIdx];
+            reconstructed[bestBenchIdx] = temp;
+            needsSub = true;
+          }
+        }
+      }
+
+      if (needsSub) {
+        setManualOverrides((prev) => ({ ...prev, [activeGW]: { ...gwLock, ids: reconstructed.map((p) => p.ID) } }));
+      }
+
+      setTeamData(reconstructed);
+      setCaptainId(gwLock.cap);
+      setViceId(gwLock.vice);
+
+    } else {
+      let deterministicIds = [...initialSquadIds];
+      if (availableGWs && availableGWs.length > 0) {
+        for (let gw = availableGWs[0]; gw < activeGW; gw++) {
+          if (manualOverrides[gw] && chipsByGw[gw] !== "fh") deterministicIds = manualOverrides[gw].ids;
+        }
+      }
+
+      const deterministicSquad = deterministicIds.map(id => hydratePlayer(id)).filter(Boolean);
+
+      const opt = getValidLayout(deterministicSquad, activeGW);
+      if (opt) {
+        setTeamData(opt.optimalArray);
+        setCaptainId(opt.cap);
+        setViceId(opt.vice);
+      }
+    }
+  }, [globalPlayers, activeGW, teamData.length, manualOverrides, pendingAutoReset]);
+
+  const activeGwEV = useMemo(() => {
+    if (!teamData.length || !activeGW) return 0;
+    const chip = chipsByGw[activeGW];
+    const capMult = chip === "tc" ? 3 : 2;
+    let total = 0;
+    teamData.slice(0, 11).forEach((p) => { if (!p.isBlank) total += (Number(p[`${activeGW}_Pts`]) || 0) * (p.ID === captainId ? capMult : 1); });
+
+    let ofIdx = 0;
+    teamData.slice(11, 15).forEach((p) => {
+      if (!p.isBlank) {
+        if (chip === "bb") {
+          total += (Number(p[`${activeGW}_Pts`]) || 0);
+        } else if (p.Pos === "G") {
+          total += (Number(p[`${activeGW}_Pts`]) || 0) * 0.04;
+        } else {
+          const bw = [0.17, 0.05, 0.02][ofIdx] || 0.02;
+          total += (Number(p[`${activeGW}_Pts`]) || 0) * bw;
+          ofIdx++;
+        }
+      }
+    });
+    return total - hitsThisGw * HIT_COST;
+  }, [teamData, activeGW, captainId, hitsThisGw, chipsByGw]);
+
+  const horizonEvData = useMemo(() => {
+    if (!teamData.length || !horizonGWs.length) return { total: 0, breakdown: {} };
+    let total = 0;
+    const breakdown = {};
+
+    // Helper to get the actual squad that existed at the start of a specific GW
+    const getSquadForGw = (targetGw) => {
+      // If it's the active GW or in the future, the current teamData is our baseline
+      if (targetGw >= activeGW) return teamData;
+
+      // If it's in the past, rebuild it from the permanent chain
+      let deterministicIds = [...initialSquadIds];
+      if (availableGWs && availableGWs.length > 0) {
+        for (let gw = availableGWs[0]; gw <= targetGw; gw++) {
+          if (manualOverrides[gw] && chipsByGw[gw] !== "fh") {
+            deterministicIds = manualOverrides[gw].ids;
+          }
+        }
+      }
+      return deterministicIds.map(id => hydratePlayer(id)).filter(Boolean);
+    };
+
+    horizonGWs.forEach((gw) => {
+      let gwPts = 0;
+      const gwChip = chipsByGw[gw];
+      const gwCapMult = gwChip === "tc" ? 3 : 2;
+
+      const applyBenchMath = (benchSlice) => {
+        let ofIdx = 0;
+        benchSlice.forEach((p) => {
+          if (!p.isBlank) {
+            if (gwChip === "bb") {
+              gwPts += (Number(p[`${gw}_Pts`]) || 0);
+            } else if (p.Pos === "G") {
+              gwPts += (Number(p[`${gw}_Pts`]) || 0) * 0.04;
+            } else {
+              const bw = [0.17, 0.05, 0.02][ofIdx] || 0.02;
+              gwPts += (Number(p[`${gw}_Pts`]) || 0) * bw;
+              ofIdx++;
+            }
+          }
+        });
+      };
+
+      // THE FIX: Use the time-accurate squad for this specific GW
+      const gwSpecificSquad = getSquadForGw(gw);
+
+      if (gw === activeGW) {
+        gwSpecificSquad.slice(0, 11).forEach((p) => { if (!p.isBlank) gwPts += (Number(p[`${gw}_Pts`]) || 0) * (p.ID === captainId ? gwCapMult : 1); });
+        applyBenchMath(gwSpecificSquad.slice(11, 15));
+      } else {
+        const gwLock = manualOverrides[gw];
+        if (gwLock && gwLock.ids) {
+          const reconstructed = gwLock.ids.map((id) => gwSpecificSquad.find((p) => String(p.ID) === String(id)) || globalPlayers.find((p) => String(p.ID) === String(id))).filter(Boolean);
+          if (reconstructed.length === 15) {
+            reconstructed.slice(0, 11).forEach((p) => { if (!p.isBlank) gwPts += (Number(p[`${gw}_Pts`]) || 0) * (p.ID === gwLock.cap ? gwCapMult : 1); });
+            applyBenchMath(reconstructed.slice(11, 15));
+          } else {
+            const opt = getValidLayout(gwSpecificSquad, gw);
+            if (opt) {
+              opt.optimalArray.slice(0, 11).forEach((p) => { gwPts += (Number(p[`${gw}_Pts`]) || 0) * (p.ID === opt.cap ? gwCapMult : 1); });
+              applyBenchMath(opt.optimalArray.slice(11, 15));
+            }
+          }
+        } else {
+          const opt = getValidLayout(gwSpecificSquad, gw);
+          if (opt) {
+            opt.optimalArray.slice(0, 11).forEach((p) => { gwPts += (Number(p[`${gw}_Pts`]) || 0) * (p.ID === opt.cap ? gwCapMult : 1); });
+            applyBenchMath(opt.optimalArray.slice(11, 15));
+          }
+        }
+      }
+      const ftStart = ftAtStartOfGw(gw, availableGWs, baselineFt, transfersByGw, chipsByGw);
+      const T = transfersByGw[gw]?.count ?? 0;
+      const isChipFree = gwChip === "wc" || gwChip === "fh";
+      const hits = isChipFree ? 0 : Math.max(0, T - ftStart);
+      const ev = gwPts - hits * HIT_COST;
+
+      total += ev;
+      breakdown[gw] = { ev, chip: gwChip, hits, ftStart, moves: T, isChipFree };
+    });
+    return { total, breakdown };
+  }, [teamData, horizonGWs, activeGW, captainId, manualOverrides, baselineFt, transfersByGw, chipsByGw, globalPlayers, initialSquadIds, availableGWs]);
+
+  const horizonEV = horizonEvData.total;
+
+  // Sync the breakdown to the active draft automatically
+  useEffect(() => {
+    if (Object.keys(horizonEvData.breakdown).length === 0) return;
+    setDrafts(prev => {
+      const activeIdx = prev.findIndex(d => d.id === activeDraftId);
+      if (activeIdx === -1) return prev;
+      const currentCached = prev[activeIdx].cachedEvs;
+      if (JSON.stringify(currentCached) === JSON.stringify(horizonEvData.breakdown)) return prev;
+
+      const next = [...prev];
+      next[activeIdx] = { ...next[activeIdx], cachedEvs: horizonEvData.breakdown };
+      return next;
+    });
+  }, [horizonEvData.breakdown, activeDraftId, setDrafts]);
+
+  // --- SOLVER API TRIGGERS & BASELINE ENGINE ---
+  const getSolverStartingState = () => {
+    const startGW = solveGWs[0];
+    const startIndex = availableGWs.indexOf(startGW);
+
+    // 1. Get Starting Squad (The exact squad going INTO the solve horizon, before current manual moves)
+    let startingIds = initialSquadIds;
+    if (startIndex > 0) {
+      const prevGw = availableGWs[startIndex - 1];
+      startingIds = manualOverrides[prevGw]?.ids || initialSquadIds;
+    }
+
+    const startingSquad = startingIds.map(id => {
+      // Try to keep exact FPL prices from current teamData
+      const existing = teamData.find(t => String(t.ID) === String(id));
+      if (existing) return existing;
+      const g = globalPlayers.find(x => String(x.ID) === String(id));
+      return g ? { ...g, Price: getPlayerPrice(g) } : null;
+    }).filter(Boolean);
+
+    // 2. Get Starting ITB (Bank BEFORE the current gameweek's moves)
+    let startingItb = baselineItb;
+    for (let i = 0; i < startIndex; i++) {
+      const gw = availableGWs[i];
+      if (chipsByGw[gw] === "fh") continue;
+      if (transfersByGw[gw]) startingItb += transfersByGw[gw].netDelta || 0;
+    }
+
+    // 3. Get Starting FTs (FTs going INTO the horizon)
+    const startingFts = ftAtStartOfGw(startGW, availableGWs, baselineFt, transfersByGw, chipsByGw);
+
+    // 4. Extract Manual Moves as Booked Transfers
+    const bookedTransfers = [];
+    solveGWs.forEach(gw => {
+      const lock = manualOverrides[gw];
+      if (lock && lock.manualTransfers) {
+        Object.entries(lock.manualTransfers).forEach(([inId, outPlayer]) => {
+          if (!String(inId).startsWith("blank_") && outPlayer) {
+            bookedTransfers.push({
+              gw: Number(gw),
+              transfer_in: Number(inId),
+              transfer_out: Number(outPlayer.ID)
+            });
+          }
+        });
+      }
+    });
+
+    return { startingSquad, startingItb, startingFts, bookedTransfers };
+  };
+
+
+  const getActiveCompSettings = (bookedTransfers) => {
+    let payload;
+
+    // If OFF: Send the absolute baseline defaults from our frontend UI + the manual moves
+    if (!comprehensiveSettings.enabled) {
+      payload = { ...DEFAULT_SETTINGS, booked_transfers: bookedTransfers };
+    }
+    // If ON: Send the user's custom edited settings + the manual moves
+    else {
+      payload = { ...comprehensiveSettings, booked_transfers: bookedTransfers };
+    }
+
+    // Safety check: If they aren't using the advanced FT list, strip it so backend uses the flat value
+    if (!payload.use_ft_value_list) {
+      delete payload.ft_value_list;
+    }
+
+    return payload;
+  };
+
+  // --- THE XMINS FILTER ENGINE ---
+  // Replicates open-fpl-solver logic BEFORE sending the payload to Python
+  const getFilteredGlobalPlayers = (startingSquad, bookedTransfers) => {
+    const activeSettings = getActiveCompSettings(bookedTransfers);
+    const xminLbPerGw = activeSettings.xmin_lb || 0;
+
+    // If the setting is 0 or disabled, skip filtering
+    if (xminLbPerGw <= 0) return globalPlayers;
+
+    // Multiply the input by the horizon length to get the total threshold
+    const totalXminThreshold = xminLbPerGw * horizonGWs.length;
+
+    // Build the "safe_players" array (Current squad + anyone you manually locked in)
+    const safePlayers = new Set(startingSquad.map(p => String(p.ID)));
+    bookedTransfers.forEach(bt => {
+      safePlayers.add(String(bt.transfer_in));
+      safePlayers.add(String(bt.transfer_out));
+    });
+
+    // Execute the filter: (total_min >= xmin_lb) | (ID in safe_players)
+    return globalPlayers.filter(p => {
+      if (safePlayers.has(String(p.ID))) return true;
+
+      let totalMins = 0;
+      horizonGWs.forEach(gw => {
+        totalMins += (Number(p[`${gw}_xMins`]) || 0);
+      });
+
+      return totalMins >= totalXminThreshold;
+    });
+  };
+
+  const runMainSolver = () => {
+    const { startingSquad, startingItb, startingFts, bookedTransfers } = getSolverStartingState();
+
+    // THE FIX: Calculate apples-to-apples baseline EV for the active window, and the past locked EV
+    const lockedBaselineEv = solveGWs.reduce((sum, gw) => sum + (horizonEvData.breakdown[gw]?.ev || 0), 0);
+    const pastBaselineEv = horizonGWs.filter(gw => !solveGWs.includes(gw)).reduce((sum, gw) => sum + (horizonEvData.breakdown[gw]?.ev || 0), 0);
+
+    apiHandleSolve({
+      teamId, solveGWs, horizonGWs, teamData: startingSquad,
+      globalPlayers: getFilteredGlobalPlayers(startingSquad, bookedTransfers),
+      itb: startingItb, availableFts: startingFts, advancedSettings, quickSettings, chipsByGw,
+      comprehensiveSettings: getActiveCompSettings(bookedTransfers),
+      lockedBaselineEv, pastBaselineEv // <-- INJECTED HERE
+    });
+  };
+
+  const runSensAnalysis = () => {
+    const { startingSquad, startingItb, startingFts, bookedTransfers } = getSolverStartingState();
+
+    const lockedBaselineEv = solveGWs.reduce((sum, gw) => sum + (horizonEvData.breakdown[gw]?.ev || 0), 0);
+    const pastBaselineEv = horizonGWs.filter(gw => !solveGWs.includes(gw)).reduce((sum, gw) => sum + (horizonEvData.breakdown[gw]?.ev || 0), 0);
+
+    apiHandleSensAnalysis({
+      teamId, solveGWs, horizonGWs, teamData: startingSquad,
+      globalPlayers: getFilteredGlobalPlayers(startingSquad, bookedTransfers),
+      itb: startingItb, availableFts: startingFts, advancedSettings, quickSettings, chipsByGw,
+      comprehensiveSettings: getActiveCompSettings(bookedTransfers), numSims,
+      lockedBaselineEv, pastBaselineEv // <-- INJECTED HERE
+    });
+  };
+
+  const runChipSolve = () => {
+    const { startingSquad, startingItb, startingFts, bookedTransfers } = getSolverStartingState();
+
+    const lockedBaselineEv = solveGWs.reduce((sum, gw) => sum + (horizonEvData.breakdown[gw]?.ev || 0), 0);
+    const pastBaselineEv = horizonGWs.filter(gw => !solveGWs.includes(gw)).reduce((sum, gw) => sum + (horizonEvData.breakdown[gw]?.ev || 0), 0);
+
+    apiHandleChipSolve({
+      teamId, horizonGWs, teamData: startingSquad,
+      globalPlayers: getFilteredGlobalPlayers(startingSquad, bookedTransfers),
+      itb: startingItb, availableFts: startingFts, advancedSettings,
+      comprehensiveSettings: getActiveCompSettings(bookedTransfers), chipSolveOptions,
+      lockedBaselineEv, pastBaselineEv // <-- INJECTED HERE
+    });
+  };
+
+  // --- MULTIVERSE DRAFT HANDLERS ---
+  const handleCloneDraft = () => {
+    if (drafts.length >= 5) { alert("Maximum of 5 realities allowed."); return; }
+    const currentDraft = drafts.find(d => d.id === activeDraftId);
+    const newId = `draft_${Date.now()}`;
+
+    // THE FIX: Deep clone ALL objects to stop timelines from sharing memory
+    const newDraft = {
+      ...currentDraft,
+      id: newId,
+      name: `${currentDraft.name} (Copy)`,
+      fixtureOverrides: JSON.parse(JSON.stringify(currentDraft.fixtureOverrides || {})),
+      sessionEdits: JSON.parse(JSON.stringify(currentDraft.sessionEdits || {})),
+      manualOverrides: JSON.parse(JSON.stringify(currentDraft.manualOverrides || {})),
+      transfersByGw: JSON.parse(JSON.stringify(currentDraft.transfersByGw || {})),
+      highlightTransferIds: JSON.parse(JSON.stringify(currentDraft.highlightTransferIds || {})),
+      solverTransferPairs: JSON.parse(JSON.stringify(currentDraft.solverTransferPairs || {})),
+      chipsByGw: JSON.parse(JSON.stringify(currentDraft.chipsByGw || {})),
+      cachedEvs: JSON.parse(JSON.stringify(currentDraft.cachedEvs || {}))
+    };
+
+    setDrafts(prev => [...prev, newDraft]);
+    setActiveDraftId(newId);
+  };
+
+  const handleNewDraft = () => {
+    if (drafts.length >= 5) { alert("Maximum of 5 realities allowed."); return; }
+    const newId = `draft_${Date.now()}`;
+    const startGW = availableGWs[0] || activeGW;
+    const pristineSquad = initialSquadIds.map(id => hydratePlayer(id)).filter(Boolean);
+    const opt = getValidLayout(pristineSquad, startGW);
+    const finalSquad = opt ? opt.optimalArray : pristineSquad;
+
+    const newDraft = {
+      id: newId, name: `Draft ${drafts.length + 1}`, teamData: finalSquad, horizon: horizon, activeGW: startGW, captainId: opt ? opt.cap : null, viceId: opt ? opt.vice : null, solverTransferPairs: {}, solverApplySnapshot: null, appliedPlanSummary: null, hitsThisGw: 0, highlightTransferIds: {}, transfersByGw: {}, chipsByGw: {}, manualOverrides: {}, fixtureOverrides: {}, sessionEdits: {}, cachedEvs: {}
+    };
+    setDrafts(prev => [...prev, newDraft]);
+    setActiveDraftId(newId);
+  };
+  // --- TIMELINE WIPING HELPER ---
+  // If you manually edit the pitch, any "future" moves planned by the solver MUST be 
+  // wiped out so that the timeline correctly cascades forward!
+  const clearFuture = (prev) => {
+    return prev; // 👈 FIXED: We no longer wipe out future gameweek plans!
+  };
+
+  const applySolution = (sol) => {
+    setSolverApplySnapshot({
+      teamData: [...teamData], availableFts, transfersByGw: { ...transfersByGw }, manualOverrides: { ...manualOverrides }, baselineItb, baselineFt
+    });
+
+    const newOverrides = { ...manualOverrides };
+    const newTransfersByGw = { ...transfersByGw };
+    const newChipsByGw = { ...chipsByGw };
+    const newHighlights = { ...highlightTransferIds };
+    const newPairs = { ...solverTransferPairs };
+
+    sol.plan.forEach(gwPlan => {
+      const gw = gwPlan.gw;
+      const getPts = (id) => { const p = globalPlayers.find(x => String(x.ID) === String(id)); return p ? (Number(p[`${gw}_Pts`]) || 0) : 0; };
+      const posOrder = { G: 1, D: 2, M: 3, F: 4 };
+      const getPos = (id) => { const p = globalPlayers.find(x => String(x.ID) === String(id)); return p ? posOrder[p.Pos] || 5 : 5; };
+
+      let activeLineup = [...gwPlan.lineup];
+      let activeBench = [...gwPlan.bench];
+      const isBB = sol.chips_used && sol.chips_used[String(gw)] === "bb";
+
+      // BUG 2 FIX: Auto-optimize the BB lineup visually so best players start
+      if (isBB) {
+        const all15 = [...activeLineup, ...activeBench];
+        const pObjs = all15.map(id => {
+          const p = globalPlayers.find(x => String(x.ID) === String(id));
+          return p ? { ...p, temp_pts: getPts(id) } : { ID: id, Pos: 'M', temp_pts: 0 };
+        });
+
+        let gks = pObjs.filter(p => p.Pos === "G").sort((a, b) => b.temp_pts - a.temp_pts);
+        let defs = pObjs.filter(p => p.Pos === "D").sort((a, b) => b.temp_pts - a.temp_pts);
+        let mids = pObjs.filter(p => p.Pos === "M").sort((a, b) => b.temp_pts - a.temp_pts);
+        let fwds = pObjs.filter(p => p.Pos === "F").sort((a, b) => b.temp_pts - a.temp_pts);
+
+        const starters = [];
+        if (gks.length) starters.push(gks.shift());
+        starters.push(...defs.splice(0, 3), ...mids.splice(0, 2), ...fwds.splice(0, 1));
+
+        const remaining = [...defs, ...mids, ...fwds].sort((a, b) => b.temp_pts - a.temp_pts);
+        starters.push(...remaining.splice(0, 11 - starters.length));
+
+        activeLineup = starters.map(p => p.ID);
+        activeBench = [gks[0]?.ID, ...remaining.map(p => p.ID)].filter(Boolean);
+      }
+
+      const sortedLineup = activeLineup.sort((a, b) => {
+        const posDiff = getPos(a) - getPos(b);
+        if (posDiff !== 0) return posDiff;
+        return getPts(b) - getPts(a);
+      });
+
+      newOverrides[gw] = { ids: [...sortedLineup, ...activeBench], cap: gwPlan.captain, vice: gwPlan.vice_captain, forcedZeros: [] };
+      if (sol.chips_used && sol.chips_used[String(gw)]) newChipsByGw[gw] = sol.chips_used[String(gw)];
+
+      if (gwPlan.transfers_in.length > 0 || gwPlan.transfers_out.length > 0) {
+        const netDelta = gwPlan.transfers_out.reduce((sum, id) => {
+          const squadP = teamData.find(p => String(p.ID) === String(id));
+          return sum + (squadP && squadP.Price ? squadP.Price : getPlayerPrice(globalPlayers.find(p => String(p.ID) === String(id))));
+        }, 0) - gwPlan.transfers_in.reduce((sum, id) => sum + (getPlayerPrice(globalPlayers.find(p => String(p.ID) === String(id))) || 0), 0);
+
+        newTransfersByGw[gw] = { count: gwPlan.transfers_in.length, hits: gwPlan.hits, netDelta: netDelta, inIds: gwPlan.transfers_in, outIds: gwPlan.transfers_out };
+        newHighlights[gw] = [...gwPlan.transfers_in];
+        const newManualTransfersForGw = {};
+        gwPlan.transfers_in.forEach((inId, idx) => {
+          const outId = gwPlan.transfers_out[idx];
+
+          const preSolveP = teamData.find(p => String(p.ID) === String(outId));
+          let outP;
+
+          if (preSolveP) {
+            outP = preSolveP;
+          } else {
+            const gMatch = globalPlayers.find(p => String(p.ID) === String(outId));
+            const marketCost = gMatch ? (gMatch.now_cost !== undefined ? gMatch.now_cost : gMatch.Price) : 0;
+            outP = gMatch ? { ...gMatch, purchase_price: marketCost, selling_price: marketCost, Price: marketCost } : null;
+          }
+
+          if (outP) {
+            const finalOutPlayer = { ...outP, Price: getPlayerPrice(outP) };
+            newManualTransfersForGw[inId] = finalOutPlayer;
+          }
+        });
+
+        // THE FIX: Delete the solver memory so it doesn't double-render alongside the manual memory!
+        delete newPairs[gw];
+
+        // CLEAN FIX: Attach the transfers directly to the master object we are building
+        // No more setState calls fighting each other inside a loop!
+        newOverrides[gw] = {
+          ...newOverrides[gw],
+          manualTransfers: {
+            ...(newOverrides[gw]?.manualTransfers || {}),
+            ...newManualTransfersForGw
+          }
+        };
+
+        // Chips are now handled properly too
+        if (gwPlan.chip) newChipsByGw[gw] = gwPlan.chip;
+
+      } else {
+        delete newTransfersByGw[gw];
+        delete newHighlights[gw];
+        delete newPairs[gw];
+      }
+    });
+
+    setManualOverrides(newOverrides); setTransfersByGw(newTransfersByGw); setChipsByGw(newChipsByGw); setHighlightTransferIds(newHighlights); setSolverTransferPairs(newPairs);
+
+    setAppliedPlanSummary({
+      horizon: `GW${sol.horizon_gws[0]} - GW${sol.horizon_gws[sol.horizon_gws.length - 1]}`,
+      ev: sol.ev,
+      objectiveScore: sol.objective_score,
+      plan: sol.plan,
+      lockedBaselineEv: horizonEV,
+      transfers: sol.plan.map(p => ({
+        gw: p.gw, chip: p.chip, itb: p.itb, hits: p.hits, ft_at_start: p.ft_at_start,
+        outs: p.transfers_out.map(id => globalPlayers.find(x => x.ID === id)?.Name || id),
+        ins: p.transfers_in.map(id => globalPlayers.find(x => x.ID === id)?.Name || id)
+      }))
+    });
+
+    if (sol.plan.length > 0) {
+      const activePlan = sol.plan.find(p => p.gw === activeGW) || sol.plan[0];
+      let nextSquad = [...teamData];
+      if (activePlan.transfers_in.length > 0) {
+        activePlan.transfers_in.forEach((inId, idx) => {
+          const pIn = globalPlayers.find(p => String(p.ID) === String(inId));
+          const outIndex = nextSquad.findIndex(p => String(p.ID) === String(activePlan.transfers_out[idx]));
+          if (outIndex !== -1 && pIn) nextSquad[outIndex] = { ...pIn, Price: getPlayerPrice(pIn) };
+        });
+      } else {
+        nextSquad = [...activePlan.lineup, ...activePlan.bench].map(id => {
+          const existing = teamData.find(t => String(t.ID) === String(id));
+          const hydrated = hydratePlayer(id);
+          if (existing && hydrated) return { ...hydrated, replacedPlayer: existing.replacedPlayer };
+          return hydrated;
+        }).filter(Boolean);
+      }
+
+      const getPts = (p) => Number(p[`${activePlan.gw}_Pts`]) || 0;
+      const finalLineup = activePlan.lineup.map(id => nextSquad.find(p => String(p.ID) === String(id))).filter(Boolean);
+      const finalBench = activePlan.bench.map(id => nextSquad.find(p => String(p.ID) === String(id))).filter(Boolean);
+
+      const sortedStarters = [
+        ...finalLineup.filter(p => p.Pos === "G").sort((a, b) => getPts(b) - getPts(a)),
+        ...finalLineup.filter(p => p.Pos === "D").sort((a, b) => getPts(b) - getPts(a)),
+        ...finalLineup.filter(p => p.Pos === "M").sort((a, b) => getPts(b) - getPts(a)),
+        ...finalLineup.filter(p => p.Pos === "F").sort((a, b) => getPts(b) - getPts(a)),
+      ];
+      const sortedBench = [
+        ...finalBench.filter(p => p.Pos === "G"),
+        ...finalBench.filter(p => p.Pos !== "G").sort((a, b) => getPts(b) - getPts(a))
+      ];
+
+      setTeamData([...sortedStarters, ...sortedBench]);
+      setCaptainId(activePlan.captain); setViceId(activePlan.vice_captain);
+    }
+    setPendingSolutions([]);
+  };
+
+  const updateFutureTimelines = (oldSquad, newSquad, currentOverrides, currentTransfers, currentPairs, customMapping = null) => {
+    let mapping = {};
+    let removedIds = [];
+    let addedIds = [];
+
+    if (customMapping) {
+      Object.keys(customMapping).forEach(k => {
+        mapping[String(k)] = String(customMapping[k]);
+        removedIds.push(String(k));
+        addedIds.push(String(customMapping[k]));
+      });
+    } else {
+      const oldIds = oldSquad.map(p => String(p.ID));
+      const newIds = newSquad.map(p => String(p.ID));
+      removedIds = oldIds.filter(id => !newIds.includes(id) && !id.startsWith("blank_"));
+      addedIds = newIds.filter(id => !oldIds.includes(id) && !id.startsWith("blank_"));
+      for (let i = 0; i < Math.min(removedIds.length, addedIds.length); i++) {
+        mapping[removedIds[i]] = addedIds[i];
+      }
+    }
+
+    const nextOverrides = { ...currentOverrides };
+    const nextTransfers = { ...currentTransfers };
+    const nextPairs = { ...currentPairs };
+
+    for (let gw = activeGW + 1; gw <= Math.max(...(availableGWs || [])); gw++) {
+
+      // 1. SURGICAL SCRUB: Remove redundant "Buy" plans to kill the ghost button,
+      // but DO NOT filter "outIds" so the Y->Z to X->Z cascade survives perfectly!
+      if (nextTransfers[gw]) {
+        nextTransfers[gw].inIds = (nextTransfers[gw].inIds || []).filter(id => !addedIds.includes(String(id)));
+        nextTransfers[gw].count = nextTransfers[gw].inIds.length;
+        if (nextTransfers[gw].count === 0) delete nextTransfers[gw];
+      }
+
+      if (nextOverrides[gw]) {
+        const lock = nextOverrides[gw];
+        const updatedIds = lock.ids.map(id => mapping[String(id)] || String(id));
+
+        // Anti-Time-Paradox: Only wipe the GW if the cascade creates literal duplicate players
+        const uniqueIds = new Set(updatedIds);
+        if (uniqueIds.size !== updatedIds.length) {
+          delete nextOverrides[gw];
+          delete nextTransfers[gw];
+          delete nextPairs[gw];
+
+          // THE FIX: Plunge the timeline into darkness so the UI doesn't glow for a deleted GW!
+          setHighlightTransferIds(prev => { const n = { ...prev }; delete n[gw]; return n; });
+          setTransfersByGw(prev => { const n = { ...prev }; delete n[gw]; return n; });
+
+          continue;
+        }
+
+        const updatedTransfers = {};
+        if (lock.manualTransfers) {
+          for (const [inId, outPlayer] of Object.entries(lock.manualTransfers)) {
+            // KILL OBSOLETE MOVES & GLOWS: Skip this move if the player is already naturally in the incoming squad
+            if (addedIds.includes(String(inId)) || newSquad.some(p => String(p.ID) === String(inId))) {
+
+              // FIX: highlightTransferIds is an object of arrays. Target the specific GW array.
+              setHighlightTransferIds(prev => ({
+                ...prev,
+                [gw]: Array.from(prev[gw] || []).filter(id => String(id) !== String(inId))
+              }));
+
+              // FIX: transfersByGw is an object of objects. Safely reduce the count.
+              setTransfersByGw(prev => {
+                const currentGwTransfers = prev[gw];
+                if (!currentGwTransfers) return prev;
+
+                const newInIds = Array.from(currentGwTransfers.inIds || []).filter(id => String(id) !== String(inId));
+                const newCount = Math.max(0, (currentGwTransfers.count || 1) - 1);
+
+                if (newCount === 0) {
+                  const next = { ...prev };
+                  delete next[gw];
+                  return next;
+                }
+                return { ...prev, [gw]: { ...currentGwTransfers, inIds: newInIds, count: newCount } };
+              });
+
+              continue;
+            }
+
+            let newOutPlayer = outPlayer;
+            const outIdStr = String(outPlayer?.ID);
+            if (outPlayer && mapping[outIdStr]) {
+              const mappedId = mapping[outIdStr];
+              let mappedP = globalPlayers.find(p => String(p.ID) === mappedId) || newSquad.find(p => String(p.ID) === mappedId);
+              if (mappedP) newOutPlayer = { ...mappedP, Price: getPlayerPrice(mappedP) };
+            }
+            updatedTransfers[mapping[String(inId)] || String(inId)] = newOutPlayer;
+          }
+        }
+
+        // --- RE-OPTIMIZE LINEUP FOR FUTURE GAMEWEEKS ---
+        // Instantly sub out the cascaded player if their EV is bad in this future gameweek
+        const reconstructedSquad = updatedIds.map(id => {
+          if (String(id).startsWith("blank_")) {
+            const replaced = updatedTransfers[id];
+            return { ID: id, isBlank: true, Pos: replaced?.Pos || "M", Name: "", Team: "", Price: 0, replacedPlayer: replaced };
+          }
+          return hydratePlayer(id);
+        }).filter(Boolean);
+
+        const opt = getValidLayout(reconstructedSquad, gw);
+
+        nextOverrides[gw] = {
+          ...lock,
+          ids: opt ? opt.optimalArray.map(p => p.ID) : updatedIds,
+          manualTransfers: updatedTransfers,
+          cap: opt ? opt.cap : mapping[String(lock.cap)] || lock.cap,
+          vice: opt ? opt.vice : mapping[String(lock.vice)] || lock.vice
+        };
+      }
+
+      if (nextPairs[gw]) {
+        const updatedGwPairs = {};
+        for (const [inId, pairData] of Object.entries(nextPairs[gw])) {
+          // KILL GHOST BUTTON & GLOW: Skip this solver memory if the player naturally returns to squad
+          if (addedIds.includes(String(inId)) || newSquad.some(p => String(p.ID) === String(inId))) {
+            setHighlightTransferIds(prev => ({ ...prev, [gw]: Array.from(prev[gw] || []).filter(id => String(id) !== String(inId)) }));
+            setTransfersByGw(prev => {
+              const currentGwTransfers = prev[gw];
+              if (!currentGwTransfers) return prev;
+              const newInIds = Array.from(currentGwTransfers.inIds || []).filter(id => String(id) !== String(inId));
+              const newCount = Math.max(0, (currentGwTransfers.count || 1) - 1);
+              if (newCount === 0) { const next = { ...prev }; delete next[gw]; return next; }
+              return { ...prev, [gw]: { ...currentGwTransfers, inIds: newInIds, count: newCount } };
+            });
+            continue;
+          }
+
+          let newOut = pairData.outPlayer;
+          const outIdStr = String(newOut?.ID);
+          if (newOut && mapping[outIdStr]) {
+            const mappedId = mapping[outIdStr];
+            let mappedP = globalPlayers.find(p => String(p.ID) === mappedId) || newSquad.find(p => String(p.ID) === mappedId);
+            if (mappedP) newOut = { ...mappedP, Price: getPlayerPrice(mappedP) };
+          }
+          updatedGwPairs[mapping[String(inId)] || String(inId)] = { outPlayer: newOut };
+        }
+
+        if (Object.keys(updatedGwPairs).length === 0) {
+          delete nextPairs[gw];
+        } else {
+          nextPairs[gw] = updatedGwPairs;
+        }
+      }
+    }
+    return { nextOverrides, nextTransfers, nextPairs };
+  };
+
+  const handleDragStart = (event) => setActiveDragPlayer(event.active.data.current.player);
+
+  const isValidSwap = (p1, p2) => {
+    if (!p1 || !p2 || p1.isBlank || p2.isBlank) return false;
+    if (p1.ID === p2.ID) return true;
+    if (p1.Pos === "G" && p2.Pos !== "G") return false;
+    if (p1.Pos !== "G" && p2.Pos === "G") return false;
+    const currentStarters = teamData.slice(0, 11);
+    const isP1Starter = currentStarters.some((p) => p.ID === p1.ID);
+    const isP2Starter = currentStarters.some((p) => p.ID === p2.ID);
+    if (isP1Starter === isP2Starter) return true;
+    const newStarters = currentStarters.filter((p) => p.ID !== p1.ID && p.ID !== p2.ID);
+    newStarters.push(isP1Starter ? p2 : p1);
+    const counts = { G: 0, D: 0, M: 0, F: 0 };
+    newStarters.forEach((p) => counts[p.Pos]++);
+    return counts.G === 1 && counts.D >= 3 && counts.M >= 2 && counts.F >= 1 && newStarters.length === 11;
+  };
+
+  const handleDragEnd = (event) => {
+    const { active, over } = event;
+    setActiveDragPlayer(null);
+    if (over && active.id !== over.id) {
+      const p1 = active.data.current.player; const p2 = over.data.current.player;
+      if (isValidSwap(p1, p2)) {
+        const newArr = [...teamData];
+        const idx1 = newArr.findIndex((p) => p.ID === p1.ID);
+        const idx2 = newArr.findIndex((p) => p.ID === p2.ID);
+        newArr[idx1] = p2; newArr[idx2] = p1;
+        const normalized = idx1 >= 11 || idx2 >= 11 ? normalizeBenchGkFirst(newArr, activeGW) : newArr;
+        const forcedZeros = manualOverrides[activeGW]?.forcedZeros || [];
+        if ((Number(p1[`${activeGW}_Pts`]) || 0) === 0 && idx2 < 11) forcedZeros.push(p1.ID);
+        if ((Number(p2[`${activeGW}_Pts`]) || 0) === 0 && idx1 < 11) forcedZeros.push(p2.ID);
+
+        let newCap = captainId; let newVice = viceId;
+        const getEV = (p) => p.isBlank ? -1000 : (Number(p[`${activeGW}_Pts`]) || 0);
+        const starters = normalized.slice(0, 11);
+        const starterIds = starters.map((p) => p.ID);
+
+        if (!starterIds.includes(newCap)) {
+          const sorted = [...starters].sort((a, b) => getEV(b) - getEV(a));
+          newCap = sorted[0]?.ID;
+          if (newCap === newVice) newVice = sorted[1]?.ID;
+        }
+        if (!starterIds.includes(newVice)) {
+          const sorted = [...starters].sort((a, b) => getEV(b) - getEV(a));
+          newVice = sorted.find((p) => p.ID !== newCap)?.ID;
+        }
+
+        setManualOverrides((prev) => clearFuture({ ...prev, [activeGW]: { ...prev[activeGW], ids: normalized.map((p) => p.ID), cap: newCap, vice: newVice, forcedZeros } }));
+        setTeamData(normalized);
+
+        setTransfersByGw(clearFuture);
+        setHighlightTransferIds(clearFuture);
+        setSolverTransferPairs(clearFuture);
+        setChipsByGw(clearFuture);
+        setAppliedPlanSummary(null);
+      }
+    }
+  };
+
+  const handleCapChange = (id, type) => {
+    let newCap = captainId; let newVice = viceId;
+    if (type === "C") { newCap = id; if (viceId === id) newVice = captainId; } else { newVice = id; if (captainId === id) newCap = viceId; }
+
+    setManualOverrides((prev) => clearFuture({ ...prev, [activeGW]: { ...prev[activeGW], ids: teamData.map((p) => p.ID), cap: newCap, vice: newVice, forcedZeros: prev[activeGW]?.forcedZeros } }));
+    setCaptainId(newCap); setViceId(newVice);
+
+    setTransfersByGw(clearFuture);
+    setHighlightTransferIds(clearFuture);
+    setSolverTransferPairs(clearFuture);
+    setChipsByGw(clearFuture);
+    setAppliedPlanSummary(null);
+  };
+
+  const handleResetGW = () => {
+    const opt = getValidLayout(teamData, activeGW);
+    if (!opt) return;
+
+    setManualOverrides((prev) => clearFuture({ ...prev, [activeGW]: { ...prev[activeGW], ids: opt.optimalArray.map((p) => p.ID), cap: opt.cap, vice: opt.vice, forcedZeros: prev[activeGW]?.forcedZeros || [] } }));
+    setTeamData(opt.optimalArray); setCaptainId(opt.cap); setViceId(opt.vice);
+
+    setTransfersByGw(clearFuture);
+    setHighlightTransferIds(clearFuture);
+    setSolverTransferPairs(clearFuture);
+    setChipsByGw(clearFuture);
+    setAppliedPlanSummary(null);
+  };
+
+  const handleChipSelect = (gw, chipType) => {
+    setChipsByGw((prev) => {
+      const next = { ...prev };
+      if (!chipType) { delete next[gw]; } else { Object.keys(next).forEach((g) => { if (next[g] === chipType) delete next[g]; }); next[gw] = chipType; }
+      return clearFuture(next);
+    });
+
+    setManualOverrides(clearFuture);
+    setTransfersByGw(clearFuture);
+    setHighlightTransferIds(clearFuture);
+    setSolverTransferPairs(clearFuture);
+    setAppliedPlanSummary(null);
+  };
+
+  const handleTransferOut = (playerToDrop) => {
+    const sellPrice = getPlayerPrice(playerToDrop);
+    const blankId = `blank_${Date.now()}`;
+    const newSquad = teamData.map((p) => String(p.ID) === String(playerToDrop.ID) ? { ID: blankId, isBlank: true, Pos: p.Pos, Name: "", Team: "", Price: 0, replacedPlayer: playerToDrop } : p);
+
+    const opt = getValidLayout(newSquad, activeGW);
+    const finalSquad = opt ? opt.optimalArray : newSquad;
+
+    let nextTransfers = { ...transfersByGw };
+    nextTransfers[activeGW] = { ...(nextTransfers[activeGW] || { count: 0, netDelta: 0 }), netDelta: (nextTransfers[activeGW]?.netDelta || 0) + sellPrice };
+
+    let nextOverrides = { ...manualOverrides };
+    nextOverrides[activeGW] = {
+      ...(nextOverrides[activeGW] || {}), ids: finalSquad.map(p => p.ID),
+      cap: opt ? opt.cap : captainId, vice: opt ? opt.vice : viceId,
+      manualTransfers: { ...(nextOverrides[activeGW]?.manualTransfers || {}), [blankId]: playerToDrop }
+    };
+
+    const mapping = { [playerToDrop.ID]: blankId };
+    const { nextOverrides: cascadedO, nextTransfers: cascadedT, nextPairs: cascadedP } = updateFutureTimelines(teamData, finalSquad, nextOverrides, nextTransfers, solverTransferPairs, mapping);
+
+    setTransfersByGw(cascadedT); setManualOverrides(cascadedO); setTeamData(finalSquad); setSolverTransferPairs(cascadedP);
+    setHighlightTransferIds(clearFuture); setChipsByGw(clearFuture); setAppliedPlanSummary(null); setSelectedPlayer(null);
+  };
+
+  const handleAddPlayer = (newPlayer) => {
+    const cost = getPlayerPrice(newPlayer);
+    if (itb < cost) return alert("Insufficient funds!");
+
+    const newSquad = teamData.map((p) => String(p.ID) === String(selectedPlayer.ID) ? { ...newPlayer, Price: cost, purchase_price: newPlayer.now_cost, selling_price: newPlayer.now_cost, replacedPlayer: selectedPlayer.replacedPlayer } : p);
+    const opt = getValidLayout(newSquad, activeGW);
+    const finalSquad = opt ? opt.optimalArray : newSquad;
+
+    let nextTransfers = { ...transfersByGw };
+    nextTransfers[activeGW] = { ...(nextTransfers[activeGW] || { count: 0, netDelta: 0 }), count: (nextTransfers[activeGW]?.count || 0) + 1, netDelta: (nextTransfers[activeGW]?.netDelta || 0) - cost };
+
+    const newManualTransfers = { ...(manualOverrides[activeGW]?.manualTransfers || {}) };
+    delete newManualTransfers[selectedPlayer.ID];
+    if (selectedPlayer.replacedPlayer) newManualTransfers[newPlayer.ID] = selectedPlayer.replacedPlayer;
+
+    let nextOverrides = { ...manualOverrides };
+    nextOverrides[activeGW] = {
+      ...nextOverrides[activeGW], ids: finalSquad.map(p => p.ID),
+      cap: opt ? opt.cap : captainId, vice: opt ? opt.vice : viceId,
+      forcedZeros: nextOverrides[activeGW]?.forcedZeros || [], manualTransfers: newManualTransfers
+    };
+
+    const mapping = { [selectedPlayer.ID]: newPlayer.ID };
+    if (selectedPlayer.replacedPlayer) mapping[selectedPlayer.replacedPlayer.ID] = newPlayer.ID;
+    const { nextOverrides: cascadedO, nextTransfers: cascadedT, nextPairs: cascadedP } = updateFutureTimelines(teamData, finalSquad, nextOverrides, nextTransfers, solverTransferPairs, mapping);
+
+    setTransfersByGw(cascadedT); setManualOverrides(cascadedO); setTeamData(finalSquad); setSolverTransferPairs(cascadedP);
+    if (opt) { setCaptainId(opt.cap); setViceId(opt.vice); }
+    setHighlightTransferIds((prev) => clearFuture({ ...prev, [activeGW]: [...(prev[activeGW] || []), newPlayer.ID] }));
+    setChipsByGw(clearFuture); setAppliedPlanSummary(null); setSelectedPlayer(null); setSearchQuery("");
+  };
+
+  const handleUndoTransfer = (e, currentId, replacedPlayer) => {
+    e.stopPropagation();
+    const buyPlayer = teamData.find((p) => String(p.ID) === String(currentId)) || globalPlayers.find((p) => String(p.ID) === String(currentId));
+    const buy = (!String(currentId).startsWith("blank_") && buyPlayer) ? getPlayerPrice(buyPlayer) : 0;
+    const sell = getPlayerPrice(replacedPlayer);
+
+    // FRESHEN REPLACED PLAYER: Ensure EV is up to date before optimizing the lineup
+    // const freshReplacedPlayer = { ...(globalPlayers.find(p => String(p.ID) === String(replacedPlayer.ID)) || replacedPlayer), Price: getPlayerPrice(replacedPlayer) };
+    const freshReplacedPlayer = hydratePlayer(replacedPlayer.ID, replacedPlayer) || replacedPlayer;
+
+    const newSquad = teamData.map((p) => (String(p.ID) === String(currentId) ? freshReplacedPlayer : p));
+    const opt = getValidLayout(newSquad, activeGW);
+    const finalSquad = opt ? opt.optimalArray : newSquad;
+
+    let nextTransfers = { ...transfersByGw };
+    const row = nextTransfers[activeGW] || { count: 0, netDelta: 0 };
+    nextTransfers[activeGW] = { ...row, count: Math.max(0, row.count - (!String(currentId).startsWith("blank_") ? 1 : 0)), netDelta: row.netDelta - (sell - buy) };
+
+    let nextOverrides = { ...manualOverrides };
+    const newManualTransfers = { ...(nextOverrides[activeGW]?.manualTransfers || {}) };
+    delete newManualTransfers[currentId];
+
+    nextOverrides[activeGW] = {
+      ...nextOverrides[activeGW], ids: finalSquad.map(p => p.ID),
+      cap: opt ? opt.cap : captainId, vice: opt ? opt.vice : viceId,
+      forcedZeros: nextOverrides[activeGW]?.forcedZeros || [], manualTransfers: newManualTransfers
+    };
+
+    const mapping = { [currentId]: replacedPlayer.ID };
+    const { nextOverrides: cascadedO, nextTransfers: cascadedT, nextPairs: cascadedP } = updateFutureTimelines(teamData, finalSquad, nextOverrides, nextTransfers, solverTransferPairs, mapping);
+
+    setTransfersByGw(cascadedT); setManualOverrides(cascadedO); setTeamData(finalSquad); setSolverTransferPairs(cascadedP);
+    if (opt) { setCaptainId(opt.cap); setViceId(opt.vice); }
+    setHighlightTransferIds((prev) => clearFuture({ ...prev, [activeGW]: Array.from(prev[activeGW] || []).filter((id) => String(id) !== String(currentId)) }));
+    setChipsByGw(clearFuture); setAppliedPlanSummary(null);
+  };
+
+  const resetHighlightedTransfer = (player) => {
+    const pair = (solverTransferPairs[activeGW] || {})[player.ID];
+    if (pair?.outPlayer) {
+      const idx = teamData.findIndex((p) => p.ID === player.ID);
+      if (idx < 0) return;
+
+      // FRESHEN REPLACED PLAYER: Ensure EV is up to date before optimizing the lineup
+      // const freshOutPlayer = { ...(globalPlayers.find(p => String(p.ID) === String(pair.outPlayer.ID)) || pair.outPlayer), Price: getPlayerPrice(pair.outPlayer) };
+      const freshOutPlayer = hydratePlayer(pair.outPlayer.ID, pair.outPlayer) || pair.outPlayer;
+      const newSquad = [...teamData]; newSquad[idx] = freshOutPlayer;
+
+      const buyPrice = getPlayerPrice(player); const sellPrice = getPlayerPrice(pair.outPlayer);
+
+      let nextTransfers = { ...transfersByGw };
+      const row = nextTransfers[activeGW] || { count: 0, netDelta: 0 };
+      nextTransfers[activeGW] = {
+        ...row, count: Math.max(0, row.count - 1), netDelta: row.netDelta - (sellPrice - buyPrice),
+        inIds: Array.from(row.inIds || []).filter(id => String(id) !== String(player.ID)), outIds: Array.from(row.outIds || []).filter(id => String(id) !== String(pair.outPlayer.ID))
+      };
+
+      const opt = getValidLayout(newSquad, activeGW);
+      const finalSquad = opt ? opt.optimalArray : newSquad;
+
+      let nextOverrides = { ...manualOverrides };
+      nextOverrides[activeGW] = { ...nextOverrides[activeGW], ids: finalSquad.map(p => p.ID), cap: opt ? opt.cap : captainId, vice: opt ? opt.vice : viceId, forcedZeros: nextOverrides[activeGW]?.forcedZeros || [] };
+
+      const mapping = { [player.ID]: pair.outPlayer.ID };
+      const { nextOverrides: cascadedO, nextTransfers: cascadedT, nextPairs: cascadedP } = updateFutureTimelines(teamData, finalSquad, nextOverrides, nextTransfers, solverTransferPairs, mapping);
+
+      setTransfersByGw(cascadedT); setManualOverrides(cascadedO); setTeamData(finalSquad);
+      if (opt) { setCaptainId(opt.cap); setViceId(opt.vice); }
+
+      const nP = { ...cascadedP };
+      if (nP[activeGW]) { delete nP[activeGW][player.ID]; }
+      setSolverTransferPairs(nP);
+
+      setHighlightTransferIds((prev) => { const n = { ...prev }; if (n[activeGW]) { const gwSet = new Set(n[activeGW]); gwSet.delete(player.ID); n[activeGW] = Array.from(gwSet); } return clearFuture(n); });
+      setChipsByGw(clearFuture); setAppliedPlanSummary(null); setSelectedPlayer(null); return;
+    }
+    if (player.replacedPlayer) { handleUndoTransfer({ stopPropagation: () => { } }, player.ID, player.replacedPlayer); return; }
+    handleTransferOut(player);
+  };
+
+  const handleResetGWTransfers = () => {
+    let previousSquadIds = [];
+    const currentIndex = availableGWs.indexOf(activeGW);
+    if (currentIndex > 0) {
+      const prevGw = availableGWs[currentIndex - 1];
+      previousSquadIds = manualOverrides[prevGw]?.ids || initialSquadIds;
+    } else {
+      previousSquadIds = initialSquadIds;
+    }
+
+    //const restoredSquadUnsorted = previousSquadIds.map(id => {
+    //   const p = globalPlayers.find(x => String(x.ID) === String(id));
+    //   const existing = teamData.find(t => String(t.ID) === String(id));
+    //   return existing ? { ...p, Price: existing.Price } : { ...p, Price: getPlayerPrice(p) };
+    // }).filter(Boolean);
+    const restoredSquadUnsorted = previousSquadIds.map(id => hydratePlayer(id)).filter(Boolean);
+
+    const opt = getValidLayout(restoredSquadUnsorted, activeGW);
+    const finalSquad = opt ? opt.optimalArray : restoredSquadUnsorted;
+
+    let nextTransfers = { ...transfersByGw };
+    delete nextTransfers[activeGW];
+
+    let nextOverrides = { ...manualOverrides };
+    nextOverrides[activeGW] = {
+      ids: finalSquad.map(p => p.ID), cap: opt ? opt.cap : captainId, vice: opt ? opt.vice : viceId, forcedZeros: [], manualTransfers: {}
+    };
+
+    const { nextOverrides: cascadedO, nextTransfers: cascadedT, nextPairs: cascadedP } = updateFutureTimelines(teamData, finalSquad, nextOverrides, nextTransfers, solverTransferPairs);
+
+    setTransfersByGw(cascadedT); setManualOverrides(cascadedO); setTeamData(finalSquad);
+    if (opt) { setCaptainId(opt.cap); setViceId(opt.vice); }
+
+    const nP = { ...cascadedP };
+    delete nP[activeGW];
+    setSolverTransferPairs(nP);
+
+    setHighlightTransferIds(prev => { const next = { ...prev }; delete next[activeGW]; return clearFuture(next); });
+    setChipsByGw(prev => { const next = { ...prev }; delete next[activeGW]; return clearFuture(next); });
+    setSolverApplySnapshot(null); setAppliedPlanSummary(null);
+  };
+
+  // --- UI FIREWALL ---
+  // Forces the Pitch to instantly drop stale undo buttons during GW tab switches
+  const renderTeamData = useMemo(() => {
+    const lock = manualOverrides[activeGW];
+    return teamData.map(p => {
+      if (p.isBlank && String(p.ID).startsWith("blank_")) return p;
+      const cleanP = { ...p };
+      if (lock?.manualTransfers && lock.manualTransfers[p.ID]) {
+        cleanP.replacedPlayer = lock.manualTransfers[p.ID];
+      } else {
+        delete cleanP.replacedPlayer;
+      }
+      return cleanP;
+    });
+  }, [teamData, activeGW, manualOverrides]);
+
+  return (
+    <div className="flex flex-col w-full h-full pb-10">
+
+      {/* Minimal Top Bar for Load */}
+      <div className="w-full flex justify-end mb-4 z-40">
+        <form onSubmit={fetchTeam} className="flex gap-2 items-center bg-slate-900/40 px-4 py-2 rounded-xl border border-slate-800 backdrop-blur-sm shadow-xl">
+          <div className="relative w-48">
+            <Search className="absolute left-3 top-1/2 -translate-y-1/2 text-slate-500" size={14} />
+            <input type="text" placeholder="FPL Team ID..." value={teamId} onChange={(e) => { setTeamId(e.target.value); setLastLoadedId(null); }} className="w-full bg-slate-950 border border-slate-700 rounded-lg py-1.5 pl-8 pr-3 text-xs text-slate-200 focus:outline-none focus:border-luigi-400 shadow-inner" />
+          </div>
+          <button type="submit" disabled={isLoading || (teamData.length > 0 && teamId === lastLoadedId)} className="bg-luigi-500 hover:bg-luigi-400 text-slate-950 font-bold px-3 py-1.5 rounded-lg text-xs flex items-center gap-1.5 shadow-lg transition-colors disabled:opacity-50 disabled:cursor-not-allowed">
+            {isLoading ? <Loader2 size={14} className="animate-spin" /> : "Load"}
+          </button>
+        </form>
+      </div>
+
+      <div className="flex flex-col xl:flex-row gap-8 w-full">
+        <div className="w-full xl:w-[72%] flex flex-col gap-4 xl:-mt-12 relative z-10">
+          {teamData.length > 0 ? (
+            <>
+
+              {/* Pitch Rendering wrapper */}
+              <DndContext sensors={sensors} collisionDetection={closestCenter} onDragStart={handleDragStart} onDragEnd={handleDragEnd}>
+
+                <div className="flex flex-col sm:flex-row items-center justify-between gap-x-6 gap-y-3 bg-slate-900/30 p-4 rounded-xl border border-slate-800/50 mb-2 min-h-[72px] sm:min-h-0">
+
+                  {/* STATS ROW - Clean spacing, non-wrapping to prevent jitter */}
+                  <div className="flex items-center gap-4 sm:gap-6 w-full sm:w-auto shrink-0">
+                    <div className="flex flex-col">
+                      <span className="text-[10px] font-black text-slate-500 uppercase">ITB</span>
+                      <span className="text-sm font-mono font-bold text-emerald-400 tabular-nums">£{Math.abs(itb) < 0.05 ? "0.0" : itb.toFixed(1)}m</span>
+                    </div>
+                    <div className="flex flex-col">
+                      <span className="text-[10px] font-black text-slate-500 uppercase">FT</span>
+                      <span className="text-sm font-mono font-bold text-cyan-400 leading-tight">
+                        {(() => {
+                          const chip = chipsByGw[activeGW]; const T = transfersByGw[activeGW]?.count ?? 0;
+                          if (chip === "wc") return <><span className="text-yellow-400 text-xs font-black">⚡ WC</span> <span className="text-slate-500 text-[10px]">({T}/∞)</span></>;
+                          if (chip === "fh") return <><span className="text-orange-400 text-xs font-black">↩ FH</span> <span className="text-slate-500 text-[10px]">({T}/∞)</span></>;
+                          return `${T} / ${ftAtStartOfGw(activeGW, availableGWs, baselineFt, transfersByGw, chipsByGw)}${hitsThisGw > 0 ? ` (-${hitsThisGw * 4} pts)` : ""}`;
+                        })()}
+                      </span>
+                    </div>
+                    <div className="flex flex-col">
+                      <span className="text-[10px] font-black text-slate-500 uppercase">Horizon</span>
+                      <select value={horizon} onChange={(e) => setHorizon(Number(e.target.value))} className="bg-transparent text-sm font-mono font-bold text-luigi-400 outline-none cursor-pointer">
+                        {Array.from({ length: maxAvailableHorizon }, (_, i) => i + 1).map((h) => (<option key={h} value={h} className="bg-slate-900">{h} {h === 1 ? "GW" : "GWs"}</option>))}
+                      </select>
+                    </div>
+                    <div className="h-8 w-px bg-slate-700 hidden sm:block"></div>
+                    <div className="flex flex-col">
+                      <span className="text-[10px] font-black text-slate-500 uppercase whitespace-nowrap">GW {activeGW} EV</span>
+                      <span className="text-sm font-mono font-bold text-cyan-400 tabular-nums">{activeGwEV.toFixed(2)}</span>
+                    </div>
+                    {horizonGWs.length > 1 && (
+                      <div className="flex flex-col">
+                        <span className="text-[10px] font-black text-slate-500 uppercase whitespace-nowrap">Horizon EV</span>
+                        <span className="text-sm font-mono font-bold text-emerald-400 tabular-nums">{horizonEV.toFixed(2)}</span>
+                      </div>
+                    )}
+                  </div>
+
+                  {/* BUTTON ROW - Pushed to the right, strictly locked nowrap */}
+                  <div className="flex flex-nowrap items-center justify-end gap-2 sm:gap-3 w-full sm:w-auto min-h-[32px] shrink-0">
+
+                    {/* 1. RESET TRANSFERS/CHIPS BUTTON (Always Rendered, Disabled if Not Needed) */}
+                    {(() => {
+                      const canReset = (transfersByGw[activeGW]?.count > 0) || chipsByGw[activeGW] || (manualOverrides[activeGW]?.manualTransfers && Object.keys(manualOverrides[activeGW].manualTransfers).length > 0);
+                      return (
+                        <button
+                          type="button"
+                          onClick={handleResetGWTransfers}
+                          disabled={!canReset}
+                          className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg bg-red-500/10 border border-red-500/20 text-red-400 text-[10px] font-black uppercase tracking-wider transition-all shadow-lg shrink-0 whitespace-nowrap hover:bg-red-500/20 hover:border-red-500/40 active:scale-95 disabled:opacity-30 disabled:cursor-not-allowed disabled:hover:bg-red-500/10 disabled:hover:border-red-500/20 disabled:active:scale-100 disabled:shadow-none"
+                        >
+                          <RotateCcw size={12} /> Reset
+                        </button>
+                      );
+                    })()}
+
+                    {/* 2. RESET LINEUP BUTTON (Always Rendered, Disabled if Not Needed) */}
+                    {(() => {
+                      let canResetLineup = false;
+                      const gwLock = manualOverrides[activeGW];
+
+                      if (gwLock?.ids && teamData.length === 15 && !teamData.some((p) => p.isBlank && !String(p.ID).startsWith("blank_"))) {
+                        const opt = getValidLayout(teamData, activeGW);
+                        if (opt) {
+                          const lockStarterSet = new Set(gwLock.ids.slice(0, 11));
+                          const optStarterSet = new Set(opt.optimalArray.slice(0, 11).map((p) => p.ID));
+                          const differentStarters = lockStarterSet.size !== optStarterSet.size || [...lockStarterSet].some((id) => !optStarterSet.has(id));
+                          const meaningfulDiff = differentStarters || gwLock.cap !== opt.cap || gwLock.vice !== opt.vice;
+
+                          if (meaningfulDiff) {
+                            const getPts = (p) => Number(p[`${activeGW}_Pts`]) || 0;
+                            const currentEV = teamData.slice(0, 11).reduce((sum, p) => sum + getPts(p) * (p.ID === gwLock.cap ? 2 : 1), 0);
+                            const optEV = opt.optimalArray.slice(0, 11).reduce((sum, p) => sum + getPts(p) * (p.ID === opt.cap ? 2 : 1), 0);
+
+                            if (optEV > currentEV + 0.01) {
+                              canResetLineup = true;
+                            }
+                          }
+                        }
+                      }
+
+                      return (
+                        <button
+                          onClick={handleResetGW}
+                          disabled={!canResetLineup}
+                          className="flex items-center gap-1.5 px-3 py-1.5 rounded-lg bg-luigi-500/10 border border-luigi-500/20 text-luigi-400 text-[10px] font-black uppercase tracking-wider transition-all shadow-lg shrink-0 whitespace-nowrap hover:bg-luigi-500/20 hover:border-luigi-500/40 active:scale-95 disabled:opacity-30 disabled:cursor-not-allowed disabled:hover:bg-luigi-500/10 disabled:hover:border-luigi-500/20 disabled:active:scale-100 disabled:shadow-none"
+                          title="Reset Lineup to Optimal"
+                        >
+                          <RotateCcw size={12} /> Reset Lineup
+                        </button>
+                      );
+                    })()}
+
+                    {/* 3. CHIP DROPDOWN */}
+                    <div className="flex items-center gap-1.5 shrink-0">
+                      <span className="text-[10px] font-black text-slate-500 uppercase tracking-wider">Chip:</span>
+                      <select value={chipsByGw[activeGW] || ""} onChange={(e) => handleChipSelect(activeGW, e.target.value || null)} className="bg-slate-900 border border-slate-700 rounded px-2 py-1 text-xs font-bold text-slate-300 focus:outline-none cursor-pointer focus:border-luigi-500">
+                        <option value="">None</option><option value="wc">⚡ WC</option><option value="fh">↩ FH</option><option value="bb">⬆ BB</option><option value="tc">✕3 TC</option>
+                      </select>
+                    </div>
+
+                  </div>
+                </div>
+
+                <DraftsComparisonTable
+                  drafts={drafts}
+                  horizonGWs={horizonGWs}
+                  activeDraftId={activeDraftId}
+                  globalPlayers={globalPlayers}
+                  setActiveDraftId={setActiveDraftId}
+                  getValidLayout={getValidLayout}
+                  availableGWs={availableGWs}
+                  setDrafts={setDrafts}
+                  baselineFt={baselineFt}
+                  baselineItb={baselineItb}
+                  ftAtStartOfGw={ftAtStartOfGw}
+                  advancedSettings={advancedSettings}
+                />
+
+                {/* MULTIVERSE TIMELINE CONTROL BAR */}
+                <div className="flex flex-col md:flex-row items-center justify-between gap-3 bg-slate-900/80 p-2.5 rounded-xl border border-[#2a2d5c] backdrop-blur-md shadow-lg mb-4 relative z-20">
+
+                  {/* LEFT: Custom Editable Dropdown Box */}
+                  <div className="relative w-full md:w-56 shrink-0 z-50">
+                    <div className="flex items-center bg-[#0a0f1c] border border-[#2a2d5c] rounded-lg overflow-hidden shadow-[inset_0_2px_10px_rgba(0,0,0,0.5)] focus-within:border-indigo-500 transition-colors h-8">
+                      <input
+                        type="text"
+                        value={drafts.find(d => d.id === activeDraftId)?.name || ""}
+                        onChange={(e) => setDrafts(prev => prev.map(d => d.id === activeDraftId ? { ...d, name: e.target.value } : d))}
+                        className="w-full bg-transparent text-indigo-100 font-bold text-[11px] py-1 px-3 outline-none placeholder:text-slate-600"
+                        placeholder="Draft Name..."
+                      />
+                      <button
+                        onClick={() => setShowDraftMenu(!showDraftMenu)}
+                        className="px-2.5 h-full flex items-center justify-center bg-[#151833] border-l border-[#2a2d5c] hover:bg-[#1e2247] transition-colors"
+                      >
+                        <span className="text-indigo-400 text-[8px]">▼</span>
+                      </button>
+                    </div>
+
+                    {showDraftMenu && (
+                      <>
+                        <div className="fixed inset-0 z-40" onClick={() => setShowDraftMenu(false)} />
+                        <div className="absolute top-full left-0 mt-1.5 w-full bg-[#0a0f1c] border border-[#2a2d5c] rounded-lg shadow-[0_10px_40px_rgba(0,0,0,0.8)] overflow-hidden py-1 z-50">
+                          {drafts.map(d => (
+                            <button
+                              key={d.id}
+                              onClick={() => { setActiveDraftId(d.id); setShowDraftMenu(false); }}
+                              className={`w-full text-left px-3 py-2 text-[11px] font-bold transition-colors ${d.id === activeDraftId ? "bg-indigo-500/20 text-indigo-300" : "text-slate-400 hover:bg-[#151833] hover:text-slate-200"}`}
+                            >
+                              {d.name}
+                            </button>
+                          ))}
+                        </div>
+                      </>
+                    )}
+                  </div>
+
+                  {/* CENTER: Gameweek Circles */}
+                  <div className="flex gap-1.5 flex-wrap justify-center flex-1">
+                    {horizonGWs.map((gw) => (
+                      <button key={gw} type="button" onClick={() => setActiveGW(gw)} className={`relative w-7 h-7 rounded-full flex items-center justify-center text-[11px] font-bold transition-all ${activeGW === gw ? "bg-luigi-500 text-slate-950 scale-110 shadow-[0_0_10px_rgba(16,185,129,0.5)]" : "bg-slate-800 text-slate-400 hover:bg-slate-700 border border-slate-700"}`}>
+                        {gw}
+                        {chipsByGw[gw] && (<span className={`absolute -top-1 -right-1 w-3 h-3 rounded-full ${CHIP_CONFIG[chipsByGw[gw]].dot} flex items-center justify-center text-[6px] font-black text-slate-950 border border-slate-950 leading-none`} title={CHIP_CONFIG[chipsByGw[gw]].label}>{CHIP_CONFIG[chipsByGw[gw]].short[0]}</span>)}
+                      </button>
+                    ))}
+                  </div>
+
+                  {/* RIGHT: Clone / New Draft / Delete */}
+                  {/* RIGHT: Clone / New Draft */}
+                  <div className="flex items-center justify-end gap-1.5 w-full md:w-auto shrink-0">
+                    <button onClick={handleCloneDraft} disabled={drafts.length >= 5} className="flex items-center gap-1.5 px-3 py-1.5 bg-indigo-500/10 hover:bg-indigo-500/20 text-indigo-400 border border-indigo-500/20 rounded-lg text-[10px] font-black uppercase tracking-wider transition-all shadow-md active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed" title="Clone reality">
+                      <Copy size={12} /> Clone
+                    </button>
+                    <button onClick={handleNewDraft} disabled={drafts.length >= 5} className="flex items-center gap-1.5 px-3 py-1.5 bg-emerald-500/10 hover:bg-emerald-500/20 text-emerald-400 border border-emerald-500/20 rounded-lg text-[10px] font-black uppercase tracking-wider transition-all shadow-md active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed" title="New timeline">
+                      <Plus size={12} /> New
+                    </button>
+                  </div>
+                </div>
+
+                <PitchView
+                  teamData={renderTeamData}
+                  activeDragPlayer={activeDragPlayer}
+                  isValidSwap={isValidSwap}
+                  captainId={captainId}
+                  viceId={viceId}
+                  handleCapChange={handleCapChange}
+                  playerCardGWs={playerCardGWs}
+                  fixtures={fixtures}
+                  activeGW={activeGW}
+                  setSelectedPlayer={setSelectedPlayer}
+                  handleUndoTransfer={handleUndoTransfer}
+                  highlightTransferIds={highlightTransferIds}
+                  solverTransferPairs={solverTransferPairs}
+                  resetHighlightedTransfer={resetHighlightedTransfer}
+                  chipsByGw={chipsByGw}
+                />
+
+                <DragOverlay dropAnimation={null}>
+                  {activeDragPlayer && !activeDragPlayer.isBlank ? (
+                    <PlayerCardVisual player={activeDragPlayer} isBench={false} captainId={captainId} viceId={viceId} playerCardGWs={playerCardGWs} fixtures={fixtures} activeGW={activeGW} />
+                  ) : null}
+                </DragOverlay>
+              </DndContext>
+            </>
+          ) : (
+            <div className="w-full min-h-[500px] border-2 border-dashed border-slate-800 rounded-2xl flex items-center justify-center text-slate-500 bg-[#0a3a2a]/30 flex-col gap-4 relative overflow-hidden">
+              {isLoadingDB || isLoading ? (
+                <>
+                  <div className="absolute inset-0 pointer-events-none flex flex-col items-center justify-evenly py-12 px-8">
+                    {[1, 4, 4, 2].map((count, rowIdx) => (
+                      <div key={rowIdx} className="flex justify-center gap-6 sm:gap-10">
+                        {Array.from({ length: count }).map((_, i) => (
+                          <div key={i} className="w-[52px] sm:w-[68px] h-[72px] sm:h-[92px] rounded-xl bg-slate-800/50 skeleton-pulse" style={{ animationDelay: `${(rowIdx * count + i) * 0.12}s` }} />
+                        ))}
+                      </div>
+                    ))}
+                  </div>
+                  <Loader2 size={32} className="animate-spin text-emerald-500 z-10" />
+                  <span className="z-10 text-sm font-bold text-slate-400">{isLoading ? "Loading squad..." : "Booting Global Engine..."}</span>
+                </>
+              ) : (
+                "Enter your FPL ID above to load your squad."
+              )}
+            </div>
+          )}
+        </div>
+
+        {/* Right Column */}
+        <div className="w-full xl:w-[28%] flex flex-col gap-4">
+
+          {/* NEW HOME FOR TABS PANEL */}
+          <div className="rounded-2xl border border-slate-700/50 bg-slate-950/80 backdrop-blur-md shadow-xl overflow-hidden relative shrink-0">
+            <TabsPanel
+              solverTab={solverTab}
+              setSolverTab={setSolverTab}
+              isSolving={isSolving}
+              isRunningSens={isRunningSens}
+              isChipSolving={isChipSolving}
+              runMainSolver={runMainSolver}
+              runSensAnalysis={runSensAnalysis}
+              runChipSolve={runChipSolve}
+              setShowAdvancedSettings={setShowAdvancedSettings}
+              quickSettings={quickSettings}
+              setQuickSettings={setQuickSettings}
+              banSearch={banSearch}
+              setBanSearch={setBanSearch}
+              lockSearch={lockSearch}
+              setLockSearch={setLockSearch}
+              globalPlayers={globalPlayers}
+              teamData={renderTeamData}
+              solveGWLabel={solveGWLabel}
+              numSims={numSims}
+              setNumSims={setNumSims}
+              sensResults={sensResults}
+              setSensResults={setSensResults}
+              sensViewGw={sensViewGw}
+              setSensViewGw={setSensViewGw}
+              chipSolveOptions={chipSolveOptions}
+              setChipSolveOptions={setChipSolveOptions}
+              chipSolveSolutions={chipSolveSolutions}
+              setChipSolveSolutions={setChipSolveSolutions}
+              horizonGWs={horizonGWs}
+              baselineEv={horizonEV}
+            />
+          </div>
+
+          <ActiveMovesPanel
+            activeGW={activeGW}
+            manualOverrides={manualOverrides}
+            globalPlayers={globalPlayers}
+            chipsByGw={chipsByGw}
+            transfersByGw={transfersByGw}
+          />
+
+          <SolverOutputPanel
+            pendingSolutions={pendingSolutions}
+            setPendingSolutions={setPendingSolutions}
+            isSolving={isSolving}
+            globalPlayers={globalPlayers}
+            applySolution={applySolution}
+            appliedPlanSummary={appliedPlanSummary}
+            setAppliedPlanSummary={setAppliedPlanSummary}
+            baselineEv={horizonEV}
+          />
+        </div>
+
+      </div>
+
+      {/* MODALS */}
+      {selectedPlayer && !selectedPlayer.isBlank && (
+        <PlayerEditModal
+          selectedPlayer={selectedPlayer} setSelectedPlayer={setSelectedPlayer} activeGW={activeGW} horizonGWs={horizonGWs} updatePlayerStat={updatePlayerStat} handleTransferOut={handleTransferOut} fixtures={fixtures} fixtureOverrides={fixtureOverrides} sessionEdits={sessionEdits} globalPlayers={globalPlayers}
+        />
+      )}
+      {selectedPlayer && selectedPlayer.isBlank && (
+        <PlayerSearchModal
+          selectedPlayer={selectedPlayer} setSelectedPlayer={setSelectedPlayer} searchQuery={searchQuery} setSearchQuery={setSearchQuery} sortConfig={sortConfig} setSortConfig={setSortConfig} globalPlayers={globalPlayers} ownedPlayerIds={ownedPlayerIds} activeGW={activeGW} itb={itb} handleAddPlayer={handleAddPlayer}
+        />
+      )}
+      {showAdvancedSettings && (
+        <AdvancedSettingsModal
+          setShowAdvancedSettings={setShowAdvancedSettings} comprehensiveSettings={comprehensiveSettings} setComprehensiveSettings={setComprehensiveSettings} advancedSettings={advancedSettings} setAdvancedSettings={setAdvancedSettings}
+        />
+      )}
+
+      {/* LOADING PORTALS */}
+      {isSolving && createPortal(
+        <div className="fixed inset-0 z-[500] flex flex-col items-center justify-center bg-slate-950/80 backdrop-blur-md p-6">
+          <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_50%_35%,rgba(16,185,129,0.14),transparent_50%)]" />
+          <div className="relative flex max-w-md flex-col items-center gap-8 rounded-2xl border border-luigi-500/20 bg-slate-950/90 px-10 py-12 shadow-[0_0_60px_rgba(16,185,129,0.15)]">
+            <div className="relative flex h-32 w-32 items-center justify-center">
+              <div className="absolute inset-0 rounded-full border-4 border-slate-800" />
+              <div className="absolute inset-0 animate-spin rounded-full border-4 border-luigi-500 border-t-transparent" />
+              {/* BRANDED LOGO */}
+              <img src="/l-logo.png" alt="Solving" className="relative w-12 h-12 object-contain animate-pulse drop-shadow-[0_0_15px_rgba(16,185,129,0.6)]" />
+            </div>
+            <div className="text-center">
+              <p className="mb-2 text-lg font-black uppercase tracking-[0.2em] text-luigi-400">Solving</p>
+              <p className="font-mono text-xs text-slate-400">Elapsed {solveElapsedSec}s · up to {quickSettings.iterations} iteration(s)</p>
+            </div>
+            <button type="button" onClick={() => abortControllerRef.current?.abort()} className="mt-4 px-6 py-2 rounded-xl bg-slate-900 border border-slate-700 text-slate-400 hover:text-white hover:border-slate-500 font-bold transition-all text-sm">Cancel Solve</button>
+          </div>
+        </div>, document.body
+      )}
+
+      {isChipSolving && createPortal(
+        <div className="fixed inset-0 z-[500] flex flex-col items-center justify-center bg-slate-950/80 backdrop-blur-md p-6">
+          <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_50%_35%,rgba(168,85,247,0.14),transparent_50%)]" />
+          <div className="relative flex max-w-md flex-col items-center gap-8 rounded-2xl border border-purple-500/20 bg-slate-950/90 px-10 py-12 shadow-[0_0_60px_rgba(168,85,247,0.15)]">
+            <div className="relative flex h-32 w-32 items-center justify-center">
+              <div className="absolute inset-0 rounded-full border-4 border-slate-800" />
+              <div className="absolute inset-0 animate-spin rounded-full border-4 border-purple-500 border-t-transparent" />
+              {/* BRANDED LOGO */}
+              <img src={lLogo} alt="Solving" className="relative w-12 h-12 object-contain animate-pulse drop-shadow-[0_0_15px_rgba(168,85,247,0.6)]" />
+            </div>
+            <div className="text-center">
+              <p className="mb-2 text-lg font-black uppercase tracking-[0.2em] text-purple-400">Chip Solving</p>
+              <p className="font-mono text-xs text-slate-400">Elapsed {chipSolveTimer}s</p>
+
+            </div>
+            <button type="button" onClick={() => abortControllerRef.current?.abort()} className="mt-4 px-6 py-2 rounded-xl bg-slate-900 border border-slate-700 text-slate-400 hover:text-white hover:border-slate-500 font-bold transition-all text-sm">Cancel Solve</button>
+          </div>
+        </div>, document.body
+      )}
+
+      {isRunningSens && createPortal(
+        <div className="fixed inset-0 z-[500] flex flex-col items-center justify-center bg-slate-950/80 backdrop-blur-md p-6">
+          <div className="pointer-events-none absolute inset-0 bg-[radial-gradient(circle_at_50%_35%,rgba(6,182,212,0.14),transparent_50%)]" />
+          <div className="relative flex max-w-md flex-col items-center gap-8 rounded-2xl border border-cyan-500/20 bg-slate-950/90 px-10 py-12 shadow-[0_0_60px_rgba(6,182,212,0.15)]">
+            <div className="relative flex h-32 w-32 items-center justify-center">
+              <div className="absolute inset-0 rounded-full border-4 border-slate-800" />
+              <div className="absolute inset-0 animate-spin rounded-full border-4 border-cyan-500 border-t-transparent" />
+              {/* BRANDED LOGO */}
+              <img src={lLogo} alt="Solving" className="relative w-12 h-12 object-contain animate-pulse drop-shadow-[0_0_15px_rgba(6,182,212,0.6)]" />
+            </div>
+            <div className="text-center">
+              <p className="mb-2 text-lg font-black uppercase tracking-[0.2em] text-cyan-400">Sensitivity Analysis</p>
+              <p className="font-mono text-xs text-slate-400">Elapsed {sensTimer}s · {numSims} sims running…</p>
+
+            </div>
+            <button type="button" onClick={() => abortControllerRef.current?.abort()} className="mt-4 px-6 py-2 rounded-xl bg-slate-900 border border-slate-700 text-slate-400 hover:text-white hover:border-slate-500 font-bold transition-all text-sm">Cancel Solve</button>
+          </div>
+        </div>, document.body
+      )}
+
+      {showIdPrompt && (
+        <div className="fixed inset-0 z-[200] flex items-center justify-center bg-black/80 backdrop-blur-sm p-4">
+          <div className="bg-slate-950 border border-slate-800 w-full max-w-sm rounded-2xl p-6 flex flex-col items-center">
+            <Shield size={24} className="text-luigi-400 mb-4" />
+            <h3 className="text-xl font-black text-slate-100 mb-2">Save as Default ID?</h3>
+            <div className="flex gap-3 w-full mt-4">
+              <button onClick={() => setShowIdPrompt(false)} className="flex-1 bg-slate-900 text-slate-300 py-2.5 rounded-xl border border-slate-700">Not Now</button>
+              <button onClick={() => { setUserProfile((prev) => ({ ...prev, defaultTeamId: pendingTeamId })); setShowIdPrompt(false); }} className="flex-1 bg-luigi-500 text-slate-950 py-2.5 rounded-xl font-bold">Save ID</button>
+            </div>
+          </div>
+        </div>
+      )}
+      {/* INITIAL LOGIN ID PROMPT */}
+      {showInitialIdPrompt && (
+        <div className="fixed inset-0 z-[600] flex items-center justify-center bg-black/80 backdrop-blur-sm p-4">
+          <div className="bg-slate-950 border border-slate-800 w-full max-w-sm rounded-2xl p-6 flex flex-col items-center shadow-[0_0_40px_rgba(16,185,129,0.1)]">
+            <Shield size={32} className="text-emerald-500 mb-4" />
+            <h3 className="text-xl font-black text-slate-100 mb-2">Welcome!</h3>
+            <p className="text-xs text-slate-400 text-center mb-6">Enter your FPL Team ID to set it as your default for future logins.</p>
+            <input
+              type="number"
+              value={initialIdInput}
+              onChange={(e) => setInitialIdInput(e.target.value)}
+              placeholder="e.g. 123456"
+              className="w-full bg-slate-900 border border-slate-700 rounded-lg py-2.5 px-4 text-sm font-bold text-slate-200 focus:outline-none focus:border-emerald-500 text-center mb-4"
+            />
+            <div className="flex gap-3 w-full">
+              <button onClick={() => setShowInitialIdPrompt(false)} className="flex-1 bg-slate-900 text-slate-400 py-2.5 rounded-xl border border-slate-700 hover:text-slate-300 transition-colors text-sm font-bold">Skip</button>
+              <button onClick={handleSaveInitialId} className="flex-1 bg-emerald-500 text-slate-950 py-2.5 rounded-xl font-black hover:bg-emerald-400 transition-colors shadow-lg text-sm">Save Default ID</button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/SolverOutputPanel.jsx

@@ -0,0 +1,201 @@
+import React from "react";
+import { Zap, ExternalLink } from "lucide-react";
+import { CHIP_CONFIG } from "../utils/fplLogic";
+
+export const SolverOutputPanel = ({
+  pendingSolutions, setPendingSolutions, isSolving, globalPlayers, applySolution, appliedPlanSummary, setAppliedPlanSummary, baselineEv = 0
+}) => {
+
+  // BULLETPROOF RELATIVE EV
+  const getRelativeEv = (sol) => {
+    if (baselineEv === undefined || !sol) return "+0.00";
+
+    const base = sol.lockedBaselineEv !== undefined ? sol.lockedBaselineEv : baselineEv;
+
+    if (typeof sol === "number") {
+      const diff = sol - base;
+      return diff >= 0 ? `+${diff.toFixed(2)}` : diff.toFixed(2);
+    }
+
+    if (!sol.plan || !Array.isArray(sol.plan) || sol.plan.length === 0) {
+      const fallbackEv = sol.ev !== undefined ? sol.ev : 0;
+      const diff = fallbackEv - base;
+      return diff >= 0 ? `+${diff.toFixed(2)}` : diff.toFixed(2);
+    }
+    
+    let pathEV = 0;
+    let hasValidGw = false;
+
+    sol.plan.forEach(gwPlan => {
+      const gw = gwPlan.gw;
+      if (gw === undefined) return;
+      hasValidGw = true;
+
+      const gwChip = gwPlan.chip;
+      const gwCapMult = gwChip === "tc" ? 3 : 2;
+      let gwPts = 0;
+
+      const getPlayer = (id) => globalPlayers.find(p => String(p.ID) === String(id));
+
+      (gwPlan.lineup || []).forEach(id => {
+        const p = getPlayer(id);
+        if (p && !p.isBlank) {
+            const pts = Number(p[`${gw}_Pts`]) || 0;
+            gwPts += pts * (String(p.ID) === String(gwPlan.captain) ? gwCapMult : 1);
+        }
+      });
+
+      let ofIdx = 0;
+      (gwPlan.bench || []).forEach(id => {
+        const p = getPlayer(id);
+        if (p && !p.isBlank) {
+          const pts = Number(p[`${gw}_Pts`]) || 0;
+          if (gwChip === "bb") {
+            gwPts += pts;
+          } else if (p.Pos === "G") {
+            gwPts += pts * 0.04;
+          } else {
+            gwPts += pts * ([0.17, 0.05, 0.02][ofIdx] || 0.02);
+            ofIdx++;
+          }
+        }
+      });
+      pathEV += gwPts - (gwPlan.hits || 0) * 4;
+    });
+
+    if (!hasValidGw || Number.isNaN(pathEV)) {
+        const fallbackEv = sol.ev !== undefined ? sol.ev : 0;
+        const diff = fallbackEv - base;
+        return diff >= 0 ? `+${diff.toFixed(2)}` : diff.toFixed(2);
+    }
+
+    const diff = pathEV - base;
+    return diff >= 0 ? `+${diff.toFixed(2)}` : diff.toFixed(2);
+  };
+
+  return (
+    <div className="w-full bg-slate-950 border border-slate-800 rounded-2xl flex flex-col h-auto shadow-2xl overflow-hidden relative min-h-[320px]">
+      <div className="border-b border-slate-800 px-5 py-4 bg-slate-900/50 flex items-center justify-between">
+        
+        {/* Left Side: Original Title & Description */}
+        <div className="flex flex-col">
+          <h2 className="text-sm font-black uppercase tracking-widest text-slate-300">Solver output</h2>
+          <p className="text-[10px] text-slate-500 mt-1">Nothing changes your squad until you apply a path.</p>
+        </div>
+
+        {/* Right Side: Sleek, Minimalist Credit */}
+        {/* Right Side: Sleek, Minimalist Credit */}
+        <a 
+          href="https://github.com/sertalpbilal/FPL-Optimization-Tools" 
+          target="_blank" 
+          rel="noopener noreferrer"
+          className="group flex items-center gap-1 text-[9px] font-bold uppercase tracking-widest transition-colors text-right whitespace-nowrap ml-4 shrink-0"
+        >
+          <span className="text-slate-600">Credit</span>
+          <span className="text-slate-500 group-hover:text-luigi-400 transition-colors">Sertalp-Moose Solver</span>
+          <ExternalLink size={10} className="text-slate-600 group-hover:text-luigi-400 transition-colors" />
+        </a>
+
+      </div>
+
+      <div className="flex-1 flex flex-col p-5 overflow-y-auto custom-scrollbar">
+        {pendingSolutions.length > 0 && !isSolving && (
+          <div className="flex flex-col gap-4">
+            <div className="flex items-center justify-between mb-2">
+              <h3 className="text-slate-200 font-black">Optimal Paths Found</h3>
+              <button onClick={() => setPendingSolutions([])} className="text-xs text-slate-500 hover:text-red-400 font-bold uppercase transition-colors">Clear</button>
+            </div>
+
+            {pendingSolutions.map((sol, index) => (
+              <div key={index} className="bg-slate-900 border border-luigi-500/30 rounded-xl p-4 flex flex-col gap-4">
+                <div className="flex justify-between items-center border-b border-slate-800 pb-2">
+                  <div className="flex items-center gap-2">
+                    <span className="font-black text-slate-300">ITERATION {sol.id || index + 1}</span>
+                    {sol.chips_used && Object.entries(sol.chips_used).map(([gw, chip]) => {
+                        const cfg = CHIP_CONFIG[chip];
+                        return cfg ? <span key={gw} className={`text-[9px] font-black px-1.5 py-0.5 rounded ${cfg.badge}`} title={`${cfg.label} in GW${gw}`}>{cfg.short}{gw}</span> : null;
+                      })}
+                  </div>
+                  <div className="flex flex-col items-end gap-0.5">
+                    <span className="text-luigi-400 font-mono font-bold text-sm">{getRelativeEv(sol)} pts</span>
+                    {sol.objective_score != null && <span className="text-slate-400 font-mono text-[10px]">eval: {sol.objective_score.toFixed(2)}</span>}
+                  </div>
+                </div>
+
+                <div className="flex flex-col gap-2">
+                  {sol.plan.map((gwPlan) => (
+                    (gwPlan.transfers_in.length > 0 || gwPlan.transfers_out.length > 0) && (
+                      <div key={gwPlan.gw} className="bg-slate-950 rounded p-2 text-xs">
+                        <div className="text-slate-500 font-bold mb-2 flex justify-between items-center">
+                          <div className="flex items-center gap-2">
+                            <span className="bg-slate-800 px-2 py-1 rounded text-slate-300">GW {gwPlan.gw}</span>
+                            {gwPlan.chip && CHIP_CONFIG[gwPlan.chip] && <span className={`text-[9px] font-black px-1.5 py-0.5 rounded ${CHIP_CONFIG[gwPlan.chip].badge}`}>{CHIP_CONFIG[gwPlan.chip].short}{gwPlan.gw}</span>}
+                          </div>
+                          <div className="flex gap-3">
+                            <span className="text-emerald-400 font-mono">ITB: £{Math.abs(gwPlan.itb) < 0.05 ? "0.0" : Number(gwPlan.itb).toFixed(1)}</span>
+                            <span className="text-cyan-400 font-mono">FT Spend: {gwPlan.chip === "wc" || gwPlan.chip === "fh" ? `${gwPlan.transfers_out?.length || 0}/∞` : `${gwPlan.transfers_out?.length || 0}/${gwPlan.ft_at_start ?? 1}${gwPlan.hits > 0 ? ` (-${gwPlan.hits * 4})` : ""}`}</span>
+                          </div>
+                        </div>
+                        {gwPlan.chip === "wc" || gwPlan.chip === "fh" ? <p className="text-[10px] text-slate-500 italic mb-1">{gwPlan.chip === "wc" ? "Wildcard active — unlimited free transfers" : "Free Hit active — squad reverts after the FH"}</p> : null}
+                        {gwPlan.transfers_out.map((id, i) => (
+                          <div key={i} className="flex justify-between items-center text-slate-300 font-mono py-0.5">
+                            <span className="text-red-400 truncate w-[40%]">{globalPlayers.find((p) => String(p.ID) === String(id))?.Name || id}</span>
+                            <span className="text-slate-600 font-bold">»</span>
+                            <span className="text-emerald-400 truncate w-[40%] text-right">{globalPlayers.find((p) => String(p.ID) === String(gwPlan.transfers_in[i]))?.Name || gwPlan.transfers_in[i]}</span>
+                          </div>
+                        ))}
+                      </div>
+                    )
+                  ))}
+                </div>
+                <button onClick={() => applySolution(sol)} className="w-full bg-slate-800 hover:bg-luigi-500 hover:text-slate-950 text-luigi-400 font-bold py-2 rounded-lg transition-colors text-sm">Apply Path</button>
+              </div>
+            ))}
+          </div>
+        )}
+
+        {!isSolving && pendingSolutions.length === 0 && (
+          appliedPlanSummary ? (
+            <div className="flex flex-col gap-3 p-1">
+              <div className="flex items-center justify-between mb-1">
+                <h4 className="text-slate-300 font-bold text-xs uppercase tracking-wider">Last Applied · {appliedPlanSummary.horizon}</h4>
+                <button onClick={() => setAppliedPlanSummary(null)} className="text-slate-600 hover:text-red-400 text-xs font-bold">✕</button>
+              </div>
+              <div className="text-[10px] text-slate-500 font-mono">{getRelativeEv(appliedPlanSummary)} pts {appliedPlanSummary.objectiveScore != null && ` · eval ${appliedPlanSummary.objectiveScore.toFixed(2)}`}</div>
+              {appliedPlanSummary.transfers.map((t, i) => (
+                <div key={i} className="bg-slate-900 rounded-lg p-2.5 text-xs">
+                  <div className="flex items-center justify-between gap-2 mb-1.5">
+                    <div className="flex items-center gap-2">
+                      <span className="text-slate-400 font-bold">GW {t.gw}</span>
+                      {t.chip && CHIP_CONFIG[t.chip] && <span className={`text-[9px] px-1 py-0.5 rounded font-black ${CHIP_CONFIG[t.chip].badge}`}>{CHIP_CONFIG[t.chip].short}{t.gw}</span>}
+                    </div>
+                    <div className="flex gap-2 text-[9px] font-mono">
+                      <span className="text-cyan-400">FT Spend: {t.chip === "wc" || t.chip === "fh" ? `${t.outs?.length || 0}/∞` : `${t.outs?.length || 0}/${t.ft_at_start ?? 1}${t.hits > 0 ? ` (-${t.hits * 4})` : ""}`}</span>
+                      <span className="text-emerald-400">£{Math.abs(t.itb) < 0.05 ? "0.0" : Number(t.itb).toFixed(1)}m</span>
+                    </div>
+                  </div>
+                  {t.outs.length === 0 && t.ins.length === 0 ? (
+                    <span className="text-slate-600 italic text-[10px]">{t.chip ? `${CHIP_CONFIG[t.chip]?.label || t.chip} active` : 'Hold — no transfers'}</span>
+                  ) : (
+                    t.outs.map((name, j) => (
+                      <div key={j} className="flex items-center gap-1 py-0.5 font-mono">
+                        <span className="text-red-400 truncate flex-1">{name}</span>
+                        <span className="text-slate-600 font-bold shrink-0">»</span>
+                        <span className="text-emerald-400 truncate flex-1 text-right">{t.ins[j] || "?"}</span>
+                      </div>
+                    ))
+                  )}
+                </div>
+              ))}
+            </div>
+          ) : (
+            <div className="flex flex-col items-center justify-center gap-3 min-h-[200px] text-slate-500 text-sm text-center px-4">
+              <Zap size={28} className="text-slate-700" />
+              Configure settings and hit <span className="text-luigi-400 font-bold">Solve</span> in the left panel.
+            </div>
+          )
+        )}
+      </div>
+    </div>
+  );
+};